activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [4/4] activemq-artemis git commit: ARTEMIS-611 Remove redundant null check
Date Thu, 28 Jul 2016 19:30:57 GMT
ARTEMIS-611 Remove redundant null check


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/72bf5b7a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/72bf5b7a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/72bf5b7a

Branch: refs/heads/master
Commit: 72bf5b7a0a0b794900361f7665e29faf05305bf4
Parents: 40c84fa
Author: Ville Skyttä <ville.skytta@iki.fi>
Authored: Thu Jul 28 19:58:10 2016 +0300
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Thu Jul 28 15:25:45 2016 -0400

----------------------------------------------------------------------
 .../artemis/core/protocol/stomp/StompConnection.java         | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/72bf5b7a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
index 07a85b1..28d0de4 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
@@ -286,11 +286,9 @@ public final class StompConnection implements RemotingConnection {
             return;
          }
 
-         if (me != null) {
-            StompFrame frame = frameHandler.createStompFrame(Stomp.Responses.ERROR);
-            frame.addHeader(Stomp.Headers.Error.MESSAGE, me.getMessage());
-            sendFrame(frame);
-         }
+         StompFrame frame = frameHandler.createStompFrame(Stomp.Responses.ERROR);
+         frame.addHeader(Stomp.Headers.Error.MESSAGE, me.getMessage());
+         sendFrame(frame);
 
          destroyed = true;
       }


Mime
View raw message