Changeset 749 for trunk/java-utils/src/main/java

Timestamp:

09/03/12 10:38:47 (12 years ago)

Author:

pharms

Message:

• removed find bugs warning

File:

• trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java (modified) (3 diffs)

trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java

@@ -245 +245 @@
                     }
                     else {
-                        resource.getFile().startsWith("file:");
                         int index = resource.getFile().lastIndexOf('!');
                         if ((index > 0) && (resource.getFile().startsWith("file:")) &&
@@ -256 +255 @@
                             try {
                                 jarInputStream = new JarInputStream(new FileInputStream(jarFile));
+                                JarEntry entry = null;
+                                do {
+                                    entry = jarInputStream.getNextJarEntry();
+                                    if ((entry != null) && (!entry.isDirectory()) &&
+                                            (entry.getName().startsWith(path)))
+                                    {
+                                        String className = entry.getName().substring
+                                            (path.length(), entry.getName().lastIndexOf('.'));
+                                        classNames.add(packageName + "." + className);
+                                    }
+                                }
+                                while (entry != null);
                             }
                             catch (Exception e) {
@@ -262 +273 @@
                                     jarFile);
                             }
-
-                            JarEntry entry = null;
-                            do {
-                                entry = jarInputStream.getNextJarEntry();
-                                if ((entry != null) && (!entry.isDirectory()) &&
-                                    (entry.getName().startsWith(path)))
-                                {
-                                    String className =
-                                        entry.getName().substring(path.length(),
-                                                                  entry.getName().lastIndexOf('.'));
-                                    classNames.add(packageName + "." + className);
+                            finally {
+                                if (jarInputStream != null) {
+                                    jarInputStream.close();
                                 }
                             }
-                            while (entry != null);
+
                         }
                     }