[jboss-cvs] JBossAS SVN: r88376 - branches/Branch_5_x/security/src/main/org/jboss/security/plugins.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2009-05-07 13:29:28 -0400 (Thu, 07 May 2009)
New Revision: 88376

Modified:
   branches/Branch_5_x/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
Log:
JBAS-6861: fixing NPE

Modified: branches/Branch_5_x/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
===================================================================
--- branches/Branch_5_x/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java	2009-05-07 17:14:53 UTC (rev 88375)
+++ branches/Branch_5_x/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java	2009-05-07 17:29:28 UTC (rev 88376)
@@ -644,7 +644,7 @@
       {
          keyStore = KeyStore.getInstance(keyStoreType);
          InputStream is = null;
-         if (!"PKCS11".equalsIgnoreCase(keyStoreType))
+         if (!"PKCS11".equalsIgnoreCase(keyStoreType) && keyStoreURL != null)
          {
             is = keyStoreURL.openStream();
          }
@@ -669,7 +669,7 @@
       {
          trustStore = KeyStore.getInstance(trustStoreType);
          InputStream is = null;
-         if (!"PKCS11".equalsIgnoreCase(trustStoreType))
+         if (!"PKCS11".equalsIgnoreCase(trustStoreType) && trustStoreURL != null)
          {
             is = trustStoreURL.openStream();
          }