[jboss-cvs] JBossAS SVN: r95619 - projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Oct 27 12:25:16 EDT 2009


Author: jesper.pedersen
Date: 2009-10-27 12:25:16 -0400 (Tue, 27 Oct 2009)
New Revision: 95619

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
Log:
Just rethrow a DeployException

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2009-10-27 16:03:47 UTC (rev 95618)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2009-10-27 16:25:16 UTC (rev 95619)
@@ -283,6 +283,11 @@
 
          return new RADeployment(url, cl);
       }
+      catch (DeployException de)
+      {
+         // Just rethrow
+         throw de;
+      }
       catch (Throwable t)
       {
          throw new DeployException("Deployment " + url.toExternalForm() + " failed", t);
@@ -301,7 +306,7 @@
     * @throws DeployException
     */
    private void initAndInject(String className, List<ConfigPropertyMetaData> cpMetas,
-      List<Object> mcfs, URLClassLoader cl) throws DeployException
+                              List<Object> mcfs, URLClassLoader cl) throws DeployException
    {
       Object mcf = null;
       try 
@@ -351,9 +356,12 @@
          // Add the contents of the directory too
          File[] jars = directory.listFiles(new JarFilter());
 
-         for (int j = 0; jars != null && j < jars.length; j++)
+         if (jars != null)
          {
-            list.add(jars[j].getCanonicalFile().toURI().toURL());
+            for (int j = 0; j < jars.length; j++)
+            {
+               list.add(jars[j].getCanonicalFile().toURI().toURL());
+            }
          }
       }
       return list.toArray(new URL[list.size()]);      




More information about the jboss-cvs-commits mailing list