You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2012/05/11 18:14:21 UTC

svn commit: r1337250 - /webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java

Author: coheigea
Date: Fri May 11 16:14:21 2012
New Revision: 1337250

URL: http://svn.apache.org/viewvc?rev=1337250&view=rev
Log:
Fix for a NPE when verifying a PublicKey

Modified:
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java?rev=1337250&r1=1337249&r2=1337250&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/components/crypto/Merlin.java Fri May 11 16:14:21 2012
@@ -1235,6 +1235,9 @@ public class Merlin extends CryptoBase {
      * Find the Public Key in a keystore. 
      */
     private boolean findPublicKeyInKeyStore(PublicKey publicKey, KeyStore keyStoreToSearch) {
+        if (keyStoreToSearch == null) {
+            return false;
+        }
         try {
             for (Enumeration<String> e = keyStoreToSearch.aliases(); e.hasMoreElements();) {
                 String alias = e.nextElement();