[CXF-1253] Fix NPE in jaxws API when stuck in lib/endorsed
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx4/specs/trunk@1391583 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jaxws-api-2.2/src/main/java/javax/xml/ws/spi/FactoryFinder.java b/jaxws-api-2.2/src/main/java/javax/xml/ws/spi/FactoryFinder.java
index 6fb3d99..a6ad195 100644
--- a/jaxws-api-2.2/src/main/java/javax/xml/ws/spi/FactoryFinder.java
+++ b/jaxws-api-2.2/src/main/java/javax/xml/ws/spi/FactoryFinder.java
@@ -171,12 +171,18 @@
ClassLoader classLoader = findClassLoader();
try {
// If we are deployed into an OSGi environment, leverage it
- Class factoryClass = FactoryFinder.class.getClassLoader().loadClass(iFactoryId);
+ Class factoryClass = null;
+ if (FactoryFinder.class.getClassLoader() != null) {
+ factoryClass = FactoryFinder.class.getClassLoader().loadClass(iFactoryId);
+ } else {
+ factoryClass = Class.forName(iFactoryId);
+ }
Class spiClass = org.apache.servicemix.specs.locator.OsgiLocator.locate(factoryClass, iFactoryId);
if (spiClass != null) {
return spiClass.newInstance();
}
} catch (Throwable e) {
+ if (debug) e.printStackTrace();
}
try {
