[jboss-cvs] jbosssx/src/main/org/jboss/security/plugins ...

[Scott S. <sco...@jb...>]

  User: starksm 
  Date: 05/04/30 00:51:50

  Modified:    src/main/org/jboss/security/plugins  JaasSecurityDomain.java
  Log:
  Use the keystore as the truststore if there is no explicit truststore given
  
  Revision  Changes    Path
  1.22      +9 -2      jbosssx/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JaasSecurityDomain.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/plugins/JaasSecurityDomain.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- JaasSecurityDomain.java	10 Aug 2004 23:43:19 -0000	1.21
  +++ JaasSecurityDomain.java	30 Apr 2005 04:51:50 -0000	1.22
  @@ -1,5 +1,5 @@
   /*
  - * JBoss, the OpenSource EJB server
  + * JBoss, Home of Professional Open Source
    *
    * Distributable under LGPL license.
    * See terms of license at gnu.org.
  @@ -94,7 +94,7 @@
    @author Sco...@jb...
    @author <a href="mailto:ja...@gr...">Jason Essington</a>
   
  - @version $Revision: 1.21 $
  + @version $Revision: 1.22 $
    */
   public class JaasSecurityDomain
      extends JaasSecurityManager
  @@ -438,6 +438,13 @@
            trustMgr = TrustManagerFactory.getInstance(algorithm);
            trustMgr.init(trustStore);
         }
  +      else if( keyStore != null )
  +      {
  +         trustStore = keyStore;
  +         String algorithm = TrustManagerFactory.getDefaultAlgorithm();
  +         trustMgr = TrustManagerFactory.getInstance(algorithm);
  +         trustMgr.init(trustStore);         
  +      }
      }
   
      private void execPasswordCmd()