You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2013/10/30 18:56:36 UTC
[1/2] git commit: Fixes
https://issues.apache.org/jira/browse/AMQ-4840 - Invalid STOMP frame sent on
websocket connections with heartbeats.
Updated Branches:
refs/heads/trunk 22dc6d444 -> 2a5929490
Fixes https://issues.apache.org/jira/browse/AMQ-4840 - Invalid STOMP frame sent on websocket connections with heartbeats.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f7311567
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f7311567
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f7311567
Branch: refs/heads/trunk
Commit: f7311567a022dcdfb00126b4931a485a8afdb134
Parents: 22dc6d4
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Wed Oct 30 13:55:55 2013 -0400
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Wed Oct 30 13:55:55 2013 -0400
----------------------------------------------------------------------
.../main/java/org/apache/activemq/transport/stomp/StompFrame.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/f7311567/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java
----------------------------------------------------------------------
diff --git a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java
index 0a9fad9..0b2c000 100644
--- a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java
+++ b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java
@@ -182,6 +182,9 @@ public class StompFrame implements Command {
}
public String format(boolean forLogging) {
+ if( !forLogging && getAction().equals(Stomp.Commands.KEEPALIVE) ) {
+ return "\n";
+ }
StringBuilder buffer = new StringBuilder();
buffer.append(getAction());
buffer.append("\n");
[2/2] git commit: Makes it easier to launch activemq from an IDE in
debug mode.
Posted by ch...@apache.org.
Makes it easier to launch activemq from an IDE in debug mode.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/2a592949
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/2a592949
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/2a592949
Branch: refs/heads/trunk
Commit: 2a59294909d0d0ede024533bca04c86a46c14411
Parents: f731156
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Wed Oct 30 13:56:22 2013 -0400
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Wed Oct 30 13:56:22 2013 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/activemq/console/Main.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/2a592949/activemq-console/src/main/java/org/apache/activemq/console/Main.java
----------------------------------------------------------------------
diff --git a/activemq-console/src/main/java/org/apache/activemq/console/Main.java b/activemq-console/src/main/java/org/apache/activemq/console/Main.java
index 7923b14..a4dfe0b 100644
--- a/activemq-console/src/main/java/org/apache/activemq/console/Main.java
+++ b/activemq-console/src/main/java/org/apache/activemq/console/Main.java
@@ -399,6 +399,7 @@ public class Main {
activeMQConfig = new File(System.getProperty("activemq.conf"));
} else {
activeMQConfig = new File(getActiveMQBase() + "/conf");
+ System.setProperty("activemq.conf", activeMQConfig.getAbsolutePath());
}
return activeMQConfig;
}
@@ -410,6 +411,7 @@ public class Main {
activeMQDataDir = new File(System.getProperty("activemq.data"));
} else {
activeMQDataDir = new File(getActiveMQBase() + "/data");
+ System.setProperty("activemq.data", activeMQDataDir.getAbsolutePath());
}
return activeMQDataDir;
}