CVS update: JGroups/src/org/jgroups/demos KeyStoreGenerator.java

"Bela Ban" <[email protected]> Mon, 27 Sep 2010 08:02:48 +0000
Newsgroups gmane.comp.java.javagroups.cvs
Message-ID <[email protected]>
  User: belaban 
  Date: 10/09/27 08:02:48

  Modified:    src/org/jgroups/demos KeyStoreGenerator.java
  Log:
  ns
  
  Revision  Changes    Path
  1.5       +8 -15     JGroups/src/org/jgroups/demos/KeyStoreGenerator.java
  
  Index: KeyStoreGenerator.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/demos/KeyStoreGenerator.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- KeyStoreGenerator.java	9 Oct 2008 13:25:52 -0000	1.4
  +++ KeyStoreGenerator.java	27 Sep 2010 08:02:48 -0000	1.5
  @@ -1,7 +1,9 @@
  -//$Id: KeyStoreGenerator.java,v 1.4 2008/10/09 13:25:52 vlada Exp $
  +//$Id: KeyStoreGenerator.java,v 1.5 2010/09/27 08:02:48 belaban Exp $
   
   package org.jgroups.demos;
   
  +import org.jgroups.util.Util;
  +
   import java.io.FileOutputStream;
   import java.io.OutputStream;
   import java.security.KeyStore;
  @@ -39,10 +41,8 @@
   
       public static void main(String[] args) {
   
  -        int i=0, j;
  +        int i=0;
           String arg=null;
  -        ;
  -        boolean specified=false;
   
           while(i < args.length && args[i].startsWith("-")) {
               arg=args[i++];
  @@ -66,8 +66,7 @@
               else if(arg.equalsIgnoreCase("--storeName")) {
   
                   if(i < args.length) {
  -                    String temp=args[i++];
  -                    keyStoreName=temp;
  +                    keyStoreName=args[i++];
                   }
                   else {
                       System.out.println("No keystore supplied using default of " + keyStoreName);
  @@ -112,7 +111,7 @@
           }
           finally {
               try {
  -                stream.close();
  +                Util.close(stream);
               }
               catch(Exception e) {
   
  @@ -122,15 +121,9 @@
       }
   
       public static SecretKey initSymKey() throws Exception {
  -        KeyGenerator keyGen=null;
  -        // generate secret key
  -
  -        keyGen=KeyGenerator.getInstance(getAlgorithm(symAlg));
  -
  +        KeyGenerator keyGen=KeyGenerator.getInstance(getAlgorithm(symAlg));
           keyGen.init(keySize);
  -        SecretKey secretKey=keyGen.generateKey();
  -
  -        return secretKey;
  +        return keyGen.generateKey();
   
       }
   
  
  
  

------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev