From 705fa05121a6a2732e2604148653705a419f4d60 Mon Sep 17 00:00:00 2001 From: Ted Date: Wed, 16 Sep 2015 09:29:54 -0700 Subject: [PATCH 1/2] FLINK-2595 Unclosed JarFile may leak resource in ClassLoaderUtilsTest --- .../apache/flink/runtime/util/ClassLoaderUtilsTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java index 654001df254c4..34e279d288eed 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java @@ -46,13 +46,16 @@ public void testWithURLClassLoader() { jarFileCreator.createJarFile(); // validate that the JAR is correct and the test setup is not broken + JarFile jarFile = null; try { - new JarFile(validJar.getAbsolutePath()); + jarFile = new JarFile(validJar.getAbsolutePath()); } catch (Exception e) { e.printStackTrace(); fail("test setup broken: cannot create a valid jar file"); - } + } finally { + if (jarFile != null) jarFile.close(); + } // file with some random contents invalidJar = File.createTempFile("flink-url-test", ".tmp"); From 07d4b6146c4a24d48ca070e29e18f62eab2a7051 Mon Sep 17 00:00:00 2001 From: Ted Date: Wed, 16 Sep 2015 13:21:16 -0700 Subject: [PATCH 2/2] Use tabs in place of spaces --- .../org/apache/flink/runtime/util/ClassLoaderUtilsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java index 34e279d288eed..7f6e1bdee6967 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ClassLoaderUtilsTest.java @@ -54,8 +54,8 @@ public void testWithURLClassLoader() { e.printStackTrace(); fail("test setup broken: cannot create a valid jar file"); } finally { - if (jarFile != null) jarFile.close(); - } + if (jarFile != null) jarFile.close(); + } // file with some random contents invalidJar = File.createTempFile("flink-url-test", ".tmp");