[jboss-cvs] JBossAS SVN: r90445 - trunk/security/src/main/org/jboss/security/plugins.

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

Author: mmoyses
Date: 2009-06-18 14:44:27 -0400 (Thu, 18 Jun 2009)
New Revision: 90445

Modified:
   trunk/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
Log:
JBAS-7039: adding IBM's implementation

Modified: trunk/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
===================================================================
--- trunk/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java	2009-06-18 18:42:21 UTC (rev 90444)
+++ trunk/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java	2009-06-18 18:44:27 UTC (rev 90445)
@@ -644,7 +644,7 @@
       {
          keyStore = KeyStore.getInstance(keyStoreType);
          InputStream is = null;
-         if (!"PKCS11".equalsIgnoreCase(keyStoreType) && keyStoreURL != null)
+         if ((!"PKCS11".equalsIgnoreCase(keyStoreType) || !"PKCS11IMPLKS".equalsIgnoreCase(keyStoreType)) && keyStoreURL != null)
          {
             is = keyStoreURL.openStream();
          }
@@ -669,7 +669,7 @@
       {
          trustStore = KeyStore.getInstance(trustStoreType);
          InputStream is = null;
-         if (!"PKCS11".equalsIgnoreCase(trustStoreType) && trustStoreURL != null)
+         if ((!"PKCS11".equalsIgnoreCase(trustStoreType) || !"PKCS11IMPLKS".equalsIgnoreCase(trustStoreType)) && trustStoreURL != null)
          {
             is = trustStoreURL.openStream();
          }