[infinispan-commits] Infinispan SVN: r584 - trunk/core/src/main/java/org/infinispan/util.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2009-07-15 11:19:19 -0400 (Wed, 15 Jul 2009)
New Revision: 584

Modified:
   trunk/core/src/main/java/org/infinispan/util/ClassFinder.java
Log:
ns

Modified: trunk/core/src/main/java/org/infinispan/util/ClassFinder.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/ClassFinder.java	2009-07-15 15:13:49 UTC (rev 583)
+++ trunk/core/src/main/java/org/infinispan/util/ClassFinder.java	2009-07-15 15:19:19 UTC (rev 584)
@@ -97,35 +97,33 @@
 
    private static List<Class<?>> findClassesOnPath(File path) throws Exception {
       List<Class<?>> classes = new ArrayList<Class<?>>();
-      if (path.isDirectory()) {
-         List<File> classFiles = new ArrayList<File>();
-         dir(classFiles, path);
-         for (File cf : classFiles) {
-            Class<?> claz;
-            try {
-               claz = Util.loadClass(toClassName(cf.getAbsolutePath().toString()));
+      try {
+         if (path.isDirectory()) {
+            List<File> classFiles = new ArrayList<File>();
+            dir(classFiles, path);
+            for (File cf : classFiles) {
+               Class<?> claz = Util.loadClass(toClassName(cf.getAbsolutePath().toString()));
                classes.add(claz);
-            } catch (Exception e) {
-               e.printStackTrace();
             }
-         }
-      } else {
-         if (path.isFile() && path.getName().endsWith("jar") && path.canRead()) {
-            JarFile jar = new JarFile(path);
-            Enumeration<JarEntry> en = jar.entries();
-            while (en.hasMoreElements()) {
-               JarEntry entry = en.nextElement();
-               if (entry.getName().endsWith("class")) {
-                  Class<?> claz;
-                  try {
-                     claz = Util.loadClass(toClassName(entry.getName()));
-                     classes.add(claz);
-                  } catch (Exception e) {
-                     e.printStackTrace();
+         } else {
+            if (path.isFile() && path.getName().endsWith("jar") && path.canRead()) {
+               JarFile jar = new JarFile(path);
+               Enumeration<JarEntry> en = jar.entries();
+               while (en.hasMoreElements()) {
+                  JarEntry entry = en.nextElement();
+                  if (entry.getName().endsWith("class")) {
+                     Class<?> claz = Util.loadClass(toClassName(entry.getName()));
+                     classes.add(claz);                      
                   }
                }
             }
          }
+      } catch (NoClassDefFoundError e) {
+         // unable to load these classes!!
+         e.printStackTrace();
+      } catch (ClassNotFoundException e) {
+         // unable to load these classes!!
+         e.printStackTrace();
       }
       return classes;
    }