Author: chirino
Date: Mon Jun 12 12:42:33 2006
New Revision: 413733
URL: http://svn.apache.org/viewvc?rev=413733&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQ-682
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.java
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java?rev=413733&r1=413732&r2=413733&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
Mon Jun 12 12:42:33 2006
@@ -561,10 +561,10 @@
return preferedWireFormatInfo;
}
- public void renegociatWireFormat(WireFormatInfo info) throws
IOException {
+ public void renegotiateWireFormat(WireFormatInfo info) throws
IOException {
if( preferedWireFormatInfo==null )
- throw new IllegalStateException("Wireformat cannot not
be renegociated.");
+ throw new IllegalStateException("Wireformat cannot not
be renegotiated.");
this.setVersion(Math.max(preferedWireFormatInfo.getVersion(),
info.getVersion()) );
this.stackTraceEnabled = info.isStackTraceEnabled() &&
preferedWireFormatInfo.isStackTraceEnabled();
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java?rev=413733&r1=413732&r2=413733&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
Mon Jun 12 12:42:33 2006
@@ -26,7 +26,7 @@
public class OpenWireFormatFactory implements WireFormatFactory {
//
- // The default values here are what the wireformat chanages to after a
default negociation.
+ // The default values here are what the wire format changes to after a
default negotiation.
//
private int version=1;
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java?rev=413733&r1=413732&r2=413733&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
Mon Jun 12 12:42:33 2006
@@ -97,7 +97,7 @@
onException(new IOException("Remote wire format
("+info.getVersion()+") is lower the minimum version required
("+minimumVersion+")"));
}
- wireFormat.renegociatWireFormat(info);
+ wireFormat.renegotiateWireFormat(info);
if (log.isDebugEnabled()) {
log.debug(this + " after negotiation: " + wireFormat);
Modified:
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.java?rev=413733&r1=413732&r2=413733&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.java
Mon Jun 12 12:42:33 2006
@@ -27,18 +27,14 @@
import javax.jms.Connection;
import javax.jms.Message;
-import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.Broker;
import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.region.RegionBroker;
import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.transport.stomp.Stomp;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -183,14 +179,14 @@
}
stompSocket.close();
broker.stop();
- log.info("Total messages receved: " + messagesCount);
- assertTrue("Messages receved after connection loss: " + messagesCount,
messagesCount >= 2000);
+ log.info("Total messages received: " + messagesCount);
+ assertTrue("Messages received after connection loss: " +
messagesCount, messagesCount >= 2000);
// The first ack messages has no chance complete, so we receiving more
messages
// Don't know how to list subscriptions for the broker. Currently you
- // can check using jmx console. You'll see
- // Subscription whithout any connections
+ // can check using JMX console. You'll see
+ // Subscription without any connections
}
public void sendFrame(String data) throws Exception {
