Repository: qpid-jms Updated Branches: refs/heads/master 78915455a -> 25b47e0b5
QPIDJMS-150: remove some dead catch blocks the compiler complains about Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/25b47e0b Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/25b47e0b Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/25b47e0b Branch: refs/heads/master Commit: 25b47e0b52f02e8df0edb8924ed820ef2bae60ac Parents: 160c102 Author: Robert Gemmell <[email protected]> Authored: Tue Feb 23 12:42:03 2016 +0000 Committer: Robert Gemmell <[email protected]> Committed: Tue Feb 23 12:45:18 2016 +0000 ---------------------------------------------------------------------- .../jms/sasl/AbstractScramSHAMechanism.java | 29 +++++++------------- 1 file changed, 10 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/25b47e0b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AbstractScramSHAMechanism.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AbstractScramSHAMechanism.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AbstractScramSHAMechanism.java index 19d3fe4..60cbf6f 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AbstractScramSHAMechanism.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AbstractScramSHAMechanism.java @@ -16,7 +16,6 @@ */ package org.apache.qpid.jms.sasl; -import java.io.IOException; import java.nio.charset.StandardCharsets; import java.security.InvalidKeyException; import java.security.MessageDigest; @@ -66,22 +65,16 @@ abstract class AbstractScramSHAMechanism extends AbstractMechanism { @Override public byte[] getInitialResponse() throws SaslException { - try { - if (state != State.INITIAL) { - throw new SaslException("Request for initial response not expected in state " + state); - } - StringBuilder buf = new StringBuilder("n="); - buf.append(saslPrep(getUsername())); - buf.append(",r="); - buf.append(clientNonce); - clientFirstMessageBare = buf.toString(); - state = State.CLIENT_FIRST_SENT; - return (GS2_HEADER + clientFirstMessageBare).getBytes(StandardCharsets.US_ASCII); - } catch (SaslException e) { - throw e; - } catch (IOException e) { - throw new SaslException(e.getMessage(), e); + if (state != State.INITIAL) { + throw new SaslException("Request for initial response not expected in state " + state); } + StringBuilder buf = new StringBuilder("n="); + buf.append(saslPrep(getUsername())); + buf.append(",r="); + buf.append(clientNonce); + clientFirstMessageBare = buf.toString(); + state = State.CLIENT_FIRST_SENT; + return (GS2_HEADER + clientFirstMessageBare).getBytes(StandardCharsets.US_ASCII); } @Override @@ -158,9 +151,7 @@ abstract class AbstractScramSHAMechanism extends AbstractMechanism { String finalMessageWithProof = clientFinalMessageWithoutProof + ",p=" + DatatypeConverter.printBase64Binary(clientProof); return finalMessageWithProof.getBytes(); - } catch (SaslException e) { - throw e; - } catch (NoSuchAlgorithmException | IOException e) { + } catch (NoSuchAlgorithmException e) { throw new SaslException(e.getMessage(), e); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
