Author: davsclaus
Date: Thu Jan  3 17:05:04 2013
New Revision: 1428481

URL: http://svn.apache.org/viewvc?rev=1428481&view=rev
Log:
Fixed potential NPE from user forum

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1428463
  Merged /camel/branches/camel-2.10.x:r1428477

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java?rev=1428481&r1=1428480&r2=1428481&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java
 Thu Jan  3 17:05:04 2013
@@ -43,7 +43,7 @@ public class WebSpherePackageScanClassRe
      * @return  <tt>true</tt> if IBM classloader, <tt>false</tt> otherwise.
      */
     public static boolean isWebSphereClassLoader(ClassLoader loader) {
-        return loader.getClass().getName().startsWith("com.ibm");
+        return loader != null ? 
loader.getClass().getName().startsWith("com.ibm") : false;
     }
 
     /**


Reply via email to