You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/01/17 12:07:03 UTC
[3/4] qpid-broker-j git commit: QPID-8046: [Broker-J]
[PlainNegotiator] Eliminate redundant UTF-8/UnsupportedEncodingException
catch block
QPID-8046: [Broker-J] [PlainNegotiator] Eliminate redundant UTF-8/UnsupportedEncodingException catch block
Cherry picked from fcca9d2
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/4b9fb37a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/4b9fb37a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/4b9fb37a
Branch: refs/heads/7.0.x
Commit: 4b9fb37abbe882193b16595ed7b8e9d8383f59e1
Parents: 30ca170
Author: Keith Wall <kw...@apache.org>
Authored: Wed Jan 17 11:29:35 2018 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Jan 17 12:06:52 2018 +0000
----------------------------------------------------------------------
.../auth/sasl/plain/PlainNegotiator.java | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4b9fb37a/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiator.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiator.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiator.java
index e56f8ca..d5fe74e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiator.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiator.java
@@ -20,7 +20,7 @@
package org.apache.qpid.server.security.auth.sasl.plain;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import org.apache.qpid.server.security.auth.AuthenticationResult;
@@ -37,7 +37,7 @@ public class PlainNegotiator implements SaslNegotiator
}
public static final String MECHANISM = "PLAIN";
- private static final String UTF8 = StandardCharsets.UTF_8.name();
+ private static final Charset UTF8 = StandardCharsets.UTF_8;
private UsernamePasswordAuthenticationProvider _usernamePasswordAuthenticationProvider;
private volatile State _state = State.INITIAL;
@@ -86,17 +86,10 @@ public class PlainNegotiator implements SaslNegotiator
}
String password;
- try
- {
- _username = new String(response, authzidNullPosition + 1, authcidNullPosition - authzidNullPosition - 1, UTF8);
- // TODO: should not get pwd as a String but as a char array...
- int passwordLen = response.length - authcidNullPosition - 1;
- password = new String(response, authcidNullPosition + 1, passwordLen, UTF8);
- }
- catch (UnsupportedEncodingException e)
- {
- throw new RuntimeException("JVM does not support UTF8", e);
- }
+ _username = new String(response, authzidNullPosition + 1, authcidNullPosition - authzidNullPosition - 1, UTF8);
+ // TODO: should not get pwd as a String but as a char array...
+ int passwordLen = response.length - authcidNullPosition - 1;
+ password = new String(response, authcidNullPosition + 1, passwordLen, UTF8);
return _usernamePasswordAuthenticationProvider.authenticate(_username, password);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org