svn commit: r654738 - /servicemix/smx3/trunk/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java

[gnodet]

Author: gnodet
Date: Fri May  9 02:34:25 2008
New Revision: 654738

URL: http://svn.apache.org/viewvc?rev=654738&view=rev
Log:
SM-1344: NPE in servicemix-http ws-security when not configuring the keystore

Modified:
    
servicemix/smx3/trunk/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java

Modified: 
servicemix/smx3/trunk/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java?rev=654738&r1=654737&r2=654738&view=diff
==============================================================================
--- 
servicemix/smx3/trunk/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
 (original)
+++ 
servicemix/smx3/trunk/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
 Fri May  9 02:34:25 2008
@@ -572,7 +572,7 @@
         if (context.getProperty(Context.AUTHENTICATION_SERVICE) != null) {
             setAuthenticationService((AuthenticationService) 
context.getProperty(Context.AUTHENTICATION_SERVICE));
         }
-        if (crypto == null && context.getProperty(Context.KEYSTORE_MANAGER) != 
null) {
+        if (crypto == null && context.getProperty(Context.KEYSTORE_MANAGER) != 
null && keystore != null) {
             KeystoreManager km = (KeystoreManager) 
context.getProperty(Context.KEYSTORE_MANAGER);
             setCrypto(new KeystoreInstanceCrypto(km, keystore));
         }