activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6169
Date Wed, 17 Feb 2016 18:17:48 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 33e27a4f5 -> 4e60075a3


https://issues.apache.org/jira/browse/AMQ-6169

Add additional null check

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

Branch: refs/heads/master
Commit: 4e60075a3217bfcaae44fc510e3214aa6c53387d
Parents: 33e27a4
Author: Timothy Bish <tabish121@gmail.com>
Authored: Wed Feb 17 13:17:37 2016 -0500
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Wed Feb 17 13:17:37 2016 -0500

----------------------------------------------------------------------
 .../org/apache/activemq/transport/stomp/ProtocolConverter.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/4e60075a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
----------------------------------------------------------------------
diff --git a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
index c4d16b2..8539b59 100644
--- a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
+++ b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
@@ -1010,7 +1010,7 @@ public class ProtocolConverter {
      */
     protected Object safeGetAction(StompFrame command) {
         String result = "<Unknown>";
-        if (command != null) {
+        if (command != null && command.getAction() != null) {
             String action = command.getAction().trim();
 
             if (action != null) {


Mime
View raw message