Skip to content

[FLINK-4096] Ensure JarOutputStream is always closed #2172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mushketyk wants to merge 1 commit into from
Closed

[FLINK-4096] Ensure JarOutputStream is always closed #2172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions flink-runtime/src/main/java/org/apache/flink/runtime/util/JarFileCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,33 +189,33 @@ public synchronized void createJarFile() throws IOException {
this.outputFile.delete();
}

final JarOutputStream jos = new JarOutputStream(new FileOutputStream(this.outputFile), new Manifest());
final Iterator<Class<?>> it = this.classSet.iterator();
while (it.hasNext()) {
try ( JarOutputStream jos = new JarOutputStream(new FileOutputStream(this.outputFile), new Manifest())) {
final Iterator<Class<?>> it = this.classSet.iterator();
while (it.hasNext()) {

final Class<?> clazz = it.next();
final String entry = clazz.getName().replace('.', '/') + CLASS_EXTENSION;
final Class<?> clazz = it.next();
final String entry = clazz.getName().replace('.', '/') + CLASS_EXTENSION;

jos.putNextEntry(new JarEntry(entry));
jos.putNextEntry(new JarEntry(entry));

String name = clazz.getName();
int n = name.lastIndexOf('.');
String className = null;
if (n > -1) {
className = name.substring(n + 1, name.length());
}
//Using the part after last dot instead of class.getSimpleName() could resolve the problem of inner class.
final InputStream classInputStream = clazz.getResourceAsStream(className + CLASS_EXTENSION);
String name = clazz.getName();
int n = name.lastIndexOf('.');
String className = null;
if (n > -1) {
className = name.substring(n + 1, name.length());
}
//Using the part after last dot instead of class.getSimpleName() could resolve the problem of inner class.
final InputStream classInputStream = clazz.getResourceAsStream(className + CLASS_EXTENSION);

int num = classInputStream.read(buf);
while (num != -1) {
jos.write(buf, 0, num);
num = classInputStream.read(buf);
}
int num = classInputStream.read(buf);
while (num != -1) {
jos.write(buf, 0, num);
num = classInputStream.read(buf);
}

classInputStream.close();
jos.closeEntry();
classInputStream.close();
jos.closeEntry();
}
}
Copy link
Contributor

@zentol zentol Jul 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

close() is now never called.

jos.close();
}
}