You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2014/02/27 16:01:57 UTC
git commit: https://issues.apache.org/jira/browse/AMQ-5078
Repository: activemq
Updated Branches:
refs/heads/trunk da72aa657 -> c3d8ca716
https://issues.apache.org/jira/browse/AMQ-5078
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c3d8ca71
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c3d8ca71
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c3d8ca71
Branch: refs/heads/trunk
Commit: c3d8ca7160194a209d98316d5521ab34f5648eaf
Parents: da72aa6
Author: Timothy Bish <ta...@gmai.com>
Authored: Thu Feb 27 10:01:49 2014 -0500
Committer: Timothy Bish <ta...@gmai.com>
Committed: Thu Feb 27 10:01:49 2014 -0500
----------------------------------------------------------------------
.../transport/stomp/ProtocolConverter.java | 32 ++++++++++++++++++--
1 file changed, 29 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/c3d8ca71/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 bfe4ed1..cc7e2e7 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
@@ -34,7 +34,33 @@ import org.apache.activemq.ActiveMQPrefetchPolicy;
import org.apache.activemq.advisory.AdvisorySupport;
import org.apache.activemq.broker.BrokerContext;
import org.apache.activemq.broker.BrokerContextAware;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ActiveMQTempQueue;
+import org.apache.activemq.command.ActiveMQTempTopic;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.command.CommandTypes;
+import org.apache.activemq.command.ConnectionError;
+import org.apache.activemq.command.ConnectionId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerControl;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.DestinationInfo;
+import org.apache.activemq.command.ExceptionResponse;
+import org.apache.activemq.command.LocalTransactionId;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.command.MessageId;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.command.RemoveSubscriptionInfo;
+import org.apache.activemq.command.Response;
+import org.apache.activemq.command.SessionId;
+import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.command.ShutdownInfo;
+import org.apache.activemq.command.TransactionId;
+import org.apache.activemq.command.TransactionInfo;
import org.apache.activemq.util.ByteArrayOutputStream;
import org.apache.activemq.util.FactoryFinder;
import org.apache.activemq.util.IOExceptionSupport;
@@ -455,7 +481,7 @@ public class ProtocolConverter {
}
if (transactions.get(stompTx) != null) {
- throw new ProtocolException("The transaction was allready started: " + stompTx);
+ throw new ProtocolException("The transaction was already started: " + stompTx);
}
LocalTransactionId activemqTx = new LocalTransactionId(connectionId, transactionIdGenerator.getNextSequenceId());
@@ -705,7 +731,7 @@ public class ProtocolConverter {
protected void onStompConnect(final StompFrame command) throws ProtocolException {
if (connected.get()) {
- throw new ProtocolException("Allready connected.");
+ throw new ProtocolException("Already connected.");
}
final Map<String, String> headers = command.getHeaders();