QPID-1471 : Simplist patch to correct argument type mismatch. An improved solution can be addressed later

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@727346 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 12 insertions, 40 deletions

diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
index 6426a91e59..36ad1b4fdc 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
@@ -606,25 +606,19 @@ public class OperationTabControl extends TabControl
                     }
                     
                     // customized for passwords
-                    String securityMechanism = "";
-                    ServerRegistry serverReg = ApplicationRegistry.getServerRegistry(_mbean);
-                    
-                    if (serverReg instanceof JMXServerRegistry)
-                    {
-                        JMXServerRegistry jmxServerReg = (JMXServerRegistry) ApplicationRegistry.getServerRegistry(_mbean);
-                        securityMechanism = jmxServerReg.getSecurityMechanism();
-                    }
-                    
-                    if ((MECH_CRAMMD5.equals(securityMechanism)) && PASSWORD.equalsIgnoreCase(param.getName()))
+                    if (PASSWORD.equalsIgnoreCase(param.getName()))
                     {
-                        try
-                        {
-                            param.setValue(ViewUtility.getMD5HashedCharArray(param.getValue()));
-                        }
-                        catch (Exception ex)
+                        if (param.getType().equals("[C"))
                         {
-                            MBeanUtility.handleException(_mbean, ex);
-                            return;
+                            try
+                            {
+                                param.setValue(ViewUtility.getHash((String)param.getValue()));
+                            }
+                            catch (Exception ex)
+                            {
+                                MBeanUtility.handleException(_mbean, ex);
+                                return;
+                            }
                         }
                     }
                     // end of customization
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
index 3245f394b5..5d6a03b238 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
@@ -536,29 +536,7 @@ public class ViewUtility
         {
             oldControls[i].dispose();
         }
-    }
-    
-    public static char[] getMD5HashedCharArray(Object text) throws NoSuchAlgorithmException, UnsupportedEncodingException
-    {
-        byte[] data = ((String)text).getBytes("utf-8");
-
-        MessageDigest md = MessageDigest.getInstance("MD5");
-
-        for (byte b : data)
-        {
-            md.update(b);
-        }
-
-        byte[] digest = md.digest();
-        
-        char[] byteArray = new char[digest.length];
-        int index = 0;
-        for (byte b : digest)
-        {
-            byteArray[index++] = (char)b;
-        }
-        return byteArray;
-    }
+    }       
     
     public static char[] getHash(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException
     {