You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/01/03 18:03:44 UTC
svn commit: r1428477 - in /camel/branches/camel-2.10.x: ./
camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java
Author: davsclaus
Date: Thu Jan 3 17:03:44 2013
New Revision: 1428477
URL: http://svn.apache.org/viewvc?rev=1428477&view=rev
Log:
Fixed potential NPE from user forum
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1428463
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java?rev=1428477&r1=1428476&r2=1428477&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java Thu Jan 3 17:03:44 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;
}
/**