From 09469b73e1ad45c286e0c39bfa60a001c4c36e80 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 22 May 2012 11:08:29 +0200 Subject: [PATCH] Cleaning up some horribly written Java code --- akka-kernel/src/main/java/akka/jmx/Client.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/akka-kernel/src/main/java/akka/jmx/Client.java b/akka-kernel/src/main/java/akka/jmx/Client.java index 9ebf63e9eb..83a8f9246f 100644 --- a/akka-kernel/src/main/java/akka/jmx/Client.java +++ b/akka-kernel/src/main/java/akka/jmx/Client.java @@ -201,12 +201,10 @@ public class Client { * @param password * @return Credentials as map for RMI. */ - protected Map formatCredentials(final String login, + protected Map formatCredentials(final String login, final String password) { - Map env = null; - String[] creds = new String[] {login, password}; - env = new HashMap(1); - env.put(JMXConnector.CREDENTIALS, creds); + Map env = new HashMap(1); + env.put(JMXConnector.CREDENTIALS, new String[] {login, password}); return env; } @@ -214,10 +212,8 @@ public class Client { final String login, final String password) throws IOException { // Make up the jmx rmi URL and get a connector. - JMXServiceURL rmiurl = new JMXServiceURL("service:jmx:rmi://" - + hostport + "/jndi/rmi://" + hostport + "/jmxrmi"); - return JMXConnectorFactory.connect(rmiurl, - formatCredentials(login, password)); + JMXServiceURL rmiurl = new JMXServiceURL("service:jmx:rmi://"+hostport+"/jndi/rmi://"+hostport+"/jmxrmi"); + return JMXConnectorFactory.connect(rmiurl,formatCredentials(login, password)); } protected ObjectName getObjectName(final String beanname)