[jboss-cvs] JBossAS SVN: r88375 - branches/Branch_4_2/security/src/main/org/jboss/security/plugins.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 7 13:14:53 EDT 2009
Author: mmoyses
Date: 2009-05-07 13:14:53 -0400 (Thu, 07 May 2009)
New Revision: 88375
Modified:
branches/Branch_4_2/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
Log:
JBAS-6861: fixing NPE
Modified: branches/Branch_4_2/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
===================================================================
--- branches/Branch_4_2/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java 2009-05-07 17:14:17 UTC (rev 88374)
+++ branches/Branch_4_2/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java 2009-05-07 17:14:53 UTC (rev 88375)
@@ -429,7 +429,7 @@
{
keyStore = KeyStore.getInstance(keyStoreType);
InputStream is = null;
- if (!"PKCS11".equalsIgnoreCase(keyStoreType))
+ if (!"PKCS11".equalsIgnoreCase(keyStoreType) && keyStoreURL != null)
{
is = keyStoreURL.openStream();
}
@@ -454,7 +454,7 @@
{
trustStore = KeyStore.getInstance(trustStoreType);
InputStream is = null;
- if (!"PKCS11".equalsIgnoreCase(trustStoreType))
+ if (!"PKCS11".equalsIgnoreCase(trustStoreType) && trustStoreURL != null)
{
is = trustStoreURL.openStream();
}
More information about the jboss-cvs-commits
mailing list