[jboss-cvs] JBossAS SVN: r92020 - projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi.

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

Author: mmoyses
Date: 2009-08-05 15:53:23 -0400 (Wed, 05 Aug 2009)
New Revision: 92020

Modified:
   projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/DecodeAction.java
Log:
SECURITY-426: fixing invocation of the mbean

Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/DecodeAction.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/DecodeAction.java	2009-08-05 19:30:43 UTC (rev 92019)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/DecodeAction.java	2009-08-05 19:53:23 UTC (rev 92020)
@@ -66,21 +66,13 @@
       return secretPassword.toCharArray();
    }
    
-   private byte[] decode64(String secret)
-   throws Exception
-   {
-     byte[] encoding = CryptoUtil.fromb64(secret);
-     byte[] decode = decode(encoding);
-     return decode;
-   }
-   
    /** Decrypt the secret using the cipherKey.
    *
    * @param secret - the encrypted secret to decrypt.
    * @return the decrypted secret
    * @throws Exception
    */
-  private byte[] decode(byte[] passw)
+  private byte[] decode64(String secret)
      throws Exception
   {
      SecurityManager sm = System.getSecurityManager();
@@ -88,8 +80,8 @@
         sm.checkPermission(decodePermission);
 
      MBeanServer server = MBeanServerLocator.locateJBoss();
-     return (byte[]) server.invoke(serviceName, "decode64", new Object[] {passw}, 
-           new String[] {byte[].class.getName()});  
+     return (byte[]) server.invoke(serviceName, "decode64", new Object[] {secret}, 
+           new String[] {String.class.getName()});
   }
   
    static char[] decode(String password, ObjectName serviceName)