You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/05/09 11:35:18 UTC

svn commit: r654740 - /servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java

Author: gnodet
Date: Fri May  9 02:35:17 2008
New Revision: 654740

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

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

Modified: servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java?rev=654740&r1=654739&r2=654740&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/main/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandler.java Fri May  9 02:35:17 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));
         }