QPID-5993 : Fix more findbugs found issues

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

3 files changed, 16 insertions, 10 deletions

diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
index 01af41c2c9..bee89fcc66 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
@@ -20,6 +20,9 @@
  */
 package org.apache.qpid.management.common.sasl;
 
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
@@ -28,8 +31,6 @@ import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslClient;
 import javax.security.sasl.SaslException;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 
 public class PlainSaslClient implements SaslClient
 {
@@ -170,9 +171,10 @@ public class PlainSaslClient implements SaslClient
         clearPassword();
     }
 
-    protected void finalize()
+    protected void finalize() throws Throwable
     {
         clearPassword();
+        super.finalize();
     }
 
     private Object[] getUserInfo() throws SaslException
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
index caee5d481a..3778e39f62 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
@@ -19,12 +19,13 @@
  */
 package org.apache.qpid.management.common.sasl;
 
+import java.io.IOException;
+
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import java.io.IOException;
 
 public class UserPasswordCallbackHandler implements CallbackHandler
 {
@@ -70,8 +71,9 @@ public class UserPasswordCallbackHandler implements CallbackHandler
         }
     }
 
-    protected void finalize()
+    protected void finalize() throws Throwable
     {
         clearPassword();
+        super.finalize();
     }
 }
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
index 314ef70144..5f12fa9dfc 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
@@ -20,15 +20,16 @@
  */
 package org.apache.qpid.management.common.sasl;
 
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 
 
 public class UsernameHashedPasswordCallbackHandler implements CallbackHandler
@@ -76,9 +77,10 @@ public class UsernameHashedPasswordCallbackHandler implements CallbackHandler
         }
     }
 
-    protected void finalize()
+    protected void finalize() throws Throwable
     {
         clearPassword();
+        super.finalize();
     }
     
     public static char[] getHash(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException