[jboss-cvs] JBossAS SVN: r106874 - projects/specs/trunk/jboss-jaxrs-api_1.1_spec/src/main/java/javax/ws/rs/ext.

[jboss-cvs-commits at lists.jboss.org]

Author: smcgowan at redhat.com
Date: 2010-07-19 22:09:55 -0400 (Mon, 19 Jul 2010)
New Revision: 106874

Modified:
   projects/specs/trunk/jboss-jaxrs-api_1.1_spec/src/main/java/javax/ws/rs/ext/FactoryFinder.java
Log:
changes picked up from org.jboss.resteasy:jaxrs-api version 2.0.0.GA

Modified: projects/specs/trunk/jboss-jaxrs-api_1.1_spec/src/main/java/javax/ws/rs/ext/FactoryFinder.java
===================================================================
--- projects/specs/trunk/jboss-jaxrs-api_1.1_spec/src/main/java/javax/ws/rs/ext/FactoryFinder.java	2010-07-20 02:05:53 UTC (rev 106873)
+++ projects/specs/trunk/jboss-jaxrs-api_1.1_spec/src/main/java/javax/ws/rs/ext/FactoryFinder.java	2010-07-20 02:09:55 UTC (rev 106874)
@@ -23,6 +23,7 @@
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.URL;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Properties;
@@ -138,12 +139,22 @@
             if (factoryClassName != null &&
                     !"".equals(factoryClassName))
             {
-               return newInstance(factoryClassName, classLoader);
+               try
+               {
+                  return newInstance(factoryClassName, classLoader);
+               }
+               catch (ClassNotFoundException e)
+               {
+                  URL url = classLoader.getResource(serviceId);
+
+                  throw new ClassNotFoundException("Could not find from factory file" + url, e);
+               }
             }
          }
       }
       catch (Exception ex)
       {
+         throw new RuntimeException(ex);
       }