[jboss-cvs] JBoss Messaging SVN: r2594 - in branches/Branch_1_0_1_SP: src/etc/server/default/deploy and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 20 11:44:23 EDT 2007
Author: timfox
Date: 2007-04-20 11:44:23 -0400 (Fri, 20 Apr 2007)
New Revision: 2594
Modified:
branches/Branch_1_0_1_SP/.classpath
branches/Branch_1_0_1_SP/build-messaging.xml
branches/Branch_1_0_1_SP/build-thirdparty.xml
branches/Branch_1_0_1_SP/src/etc/server/default/deploy/messaging-service.xml
branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/container/ConnectionAspect.java
branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/container/ConsumerAspect.java
branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/container/StateCreationAspect.java
branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/remoting/CallbackManager.java
branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/state/ConnectionState.java
branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/ServerPeer.java
branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ClientDelivery.java
branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java
Log:
Fixed dependencies to not rely on snapshot, also http://jira.jboss.org/jira/browse/JBMESSAGING-885 and http://jira.jboss.org/jira/browse/JBMESSAGING-944
Modified: branches/Branch_1_0_1_SP/.classpath
===================================================================
--- branches/Branch_1_0_1_SP/.classpath 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/.classpath 2007-04-20 15:44:23 UTC (rev 2594)
@@ -21,7 +21,7 @@
<classpathentry kind="lib" path="lib/jboss-system.jar"/>
<classpathentry kind="lib" path="lib/jboss-transaction.jar"/>
<classpathentry kind="lib" path="lib/jnp-client.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="C:/dev/messaging/trunk/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
<classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="tests/lib/jboss-common-jdbc-wrapper.jar"/>
<classpathentry kind="lib" path="tests/lib/jboss-jca.jar"/>
@@ -56,13 +56,12 @@
<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jdk14-pluggable-instrumentor.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/jrockit-pluggable-instrumentor.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/pluggable-instrumentor.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/common/lib/jboss-archive-browsing.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/common/lib/jboss-common-client.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/common/lib/namespace.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/backport-util-concurrent.jar"/>
<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/retrotranslator-runtime.jar"/>
<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/retrotranslator-transformer.jar"/>
<classpathentry kind="lib" path="thirdparty/trove/lib/trove.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/Branch_1_0_1_SP/build-messaging.xml
===================================================================
--- branches/Branch_1_0_1_SP/build-messaging.xml 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/build-messaging.xml 2007-04-20 15:44:23 UTC (rev 2594)
@@ -464,7 +464,7 @@
<!-- we need org/jboss/util/collection.SoftValueHashMap
which was moved http://jira.jboss.org/jira/browse/JBMESSAGING-281
-->
- <unjar dest="${build.scoped-sar}/tmp" src="${jboss.common.lib}/jboss-common.jar" >
+ <unjar dest="${build.scoped-sar}/tmp" src="${jboss/common.core.lib}/jboss-common-core.jar" >
<patternset>
<include name="org/jboss/util/collection/SoftValueHashMap*.class"/>
<!--
@@ -480,7 +480,7 @@
<fileset dir="${build.scoped-sar}/tmp" includes="**"/>
</delete>
<!-- I also need org.jboss.util.stream.* -->
- <unjar dest="${build.scoped-sar}/tmp" src="${jboss.common.lib}/jboss-common.jar">
+ <unjar dest="${build.scoped-sar}/tmp" src="${jboss/common.core.lib}/jboss-common-core.jar">
<patternset>
<include name="org/jboss/util/stream/**"/>
</patternset>
@@ -538,7 +538,9 @@
<unjar dest="${project.output}/jboss-messaging-client" src="${javassist.javassist.lib}/javassist.jar"/>
<unjar dest="${project.output}/jboss-messaging-client" src="${trove.trove.lib}/trove.jar"/>
<unjar dest="${project.output}/jboss-messaging-client" src="${build.scoped-sar}/jboss-common-softvaluehashmap.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${jboss.common.lib}/jboss-common-client.jar"/>
+ <unjar dest="${project.output}/jboss-messaging-client" src="${jboss/common.core.lib}/jboss-common-core.jar"/>
+ <unjar dest="${project.output}/jboss-messaging-client" src="${jboss/common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
+ <unjar dest="${project.output}/jboss-messaging-client" src="${jboss/common.logging.spi.lib}/jboss-logging-spi.jar"/>
<unjar dest="${project.output}/jboss-messaging-client" src="${jboss.j2ee.lib}/jboss-j2ee.jar"/>
<unjar dest="${project.output}/jboss-messaging-client" src="${jboss.j2se.lib}/jboss-j2se.jar"/>
<unjar dest="${project.output}/jboss-messaging-client" src="${jboss.naming.lib}/jnp-client.jar"/>
Modified: branches/Branch_1_0_1_SP/build-thirdparty.xml
===================================================================
--- branches/Branch_1_0_1_SP/build-thirdparty.xml 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/build-thirdparty.xml 2007-04-20 15:44:23 UTC (rev 2594)
@@ -87,7 +87,7 @@
<componentref name="javassist" version="3.2.0.GA"/>
<componentref name="jgroups" version="2.3"/>
<componentref name="trove" version="1.0.2"/>
- <componentref name="jboss/common-core" version="2.0.2.GA"/>
+ <componentref name="jboss/common-core" version="2.0.3.GA"/>
<componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>
<componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
<componentref name="jboss/aop" version="1.5.0.GA"/>
Modified: branches/Branch_1_0_1_SP/src/etc/server/default/deploy/messaging-service.xml
===================================================================
--- branches/Branch_1_0_1_SP/src/etc/server/default/deploy/messaging-service.xml 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/src/etc/server/default/deploy/messaging-service.xml 2007-04-20 15:44:23 UTC (rev 2594)
@@ -14,7 +14,7 @@
<constructor>
<!-- ServerPeerID -->
- <arg type="java.lang.String" value="server.0" />
+ <arg type="java.lang.String" value="0" />
<!-- DefaultQueueJNDIContext -->
<arg type="java.lang.String" value="/queue" />
<!-- DefaultTopicJNDIContext -->
Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/container/ConnectionAspect.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/container/ConnectionAspect.java 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/container/ConnectionAspect.java 2007-04-20 15:44:23 UTC (rev 2594)
@@ -174,10 +174,10 @@
state.getRemotingConnection().stop();
// Remove reference to resource manager
- ResourceManagerFactory.instance.checkInResourceManager(state.getServerID());
+ ResourceManagerFactory.instance.checkInResourceManager(String.valueOf(state.getServerID()));
// Remove reference to message id generator
- MessageIdGeneratorFactory.instance.checkInGenerator(state.getServerID());
+ MessageIdGeneratorFactory.instance.checkInGenerator(String.valueOf(state.getServerID()));
return ret;
}
Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/container/ConsumerAspect.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/container/ConsumerAspect.java 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/container/ConsumerAspect.java 2007-04-20 15:44:23 UTC (rev 2594)
@@ -89,7 +89,7 @@
sessionState.addCallbackHandler(messageHandler);
CallbackManager cm = connectionState.getRemotingConnection().getCallbackManager();
- cm.registerHandler(consumerID, messageHandler);
+ cm.registerHandler(connectionState.getServerID(), consumerID, messageHandler);
consumerState.setMessageCallbackHandler(messageHandler);
@@ -118,7 +118,7 @@
sessionState.removeCallbackHandler(consumerState.getMessageCallbackHandler());
CallbackManager cm = connectionState.getRemotingConnection().getCallbackManager();
- cm.unregisterHandler(consumerState.getConsumerID());
+ cm.unregisterHandler(connectionState.getServerID(), consumerState.getConsumerID());
return res;
}
Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/container/StateCreationAspect.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/container/StateCreationAspect.java 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/container/StateCreationAspect.java 2007-04-20 15:44:23 UTC (rev 2594)
@@ -81,11 +81,11 @@
ClientConnectionDelegate connectionDelegate = (ClientConnectionDelegate)inv.invokeNext();
connectionDelegate.init();
- String serverID = cfd.getServerID();
+ int serverID = cfd.getServerID();
- ResourceManager rm = ResourceManagerFactory.instance.checkOutResourceManager(serverID);
+ ResourceManager rm = ResourceManagerFactory.instance.checkOutResourceManager(String.valueOf(serverID));
MessageIdGenerator gen =
- MessageIdGeneratorFactory.instance.checkOutGenerator(serverID, cfd);
+ MessageIdGeneratorFactory.instance.checkOutGenerator(String.valueOf(serverID), cfd);
ConnectionState connectionState =
new ConnectionState(serverID, connectionDelegate,
Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2007-04-20 15:44:23 UTC (rev 2594)
@@ -68,7 +68,7 @@
protected String serverLocatorURI;
protected Version serverVersion;
- protected String serverID;
+ protected int serverID;
protected boolean clientPing;
private boolean trace;
@@ -78,7 +78,7 @@
// Constructors --------------------------------------------------
public ClientConnectionFactoryDelegate(int objectID, String serverLocatorURI,
- Version serverVersion, String serverID,
+ Version serverVersion, int serverID,
boolean clientPing)
{
super(objectID);
@@ -246,7 +246,7 @@
return serverVersion;
}
- public String getServerID()
+ public int getServerID()
{
return serverID;
}
Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/remoting/CallbackManager.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/remoting/CallbackManager.java 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/remoting/CallbackManager.java 2007-04-20 15:44:23 UTC (rev 2594)
@@ -28,6 +28,7 @@
import org.jboss.jms.server.endpoint.ClientDelivery;
import org.jboss.jms.server.remoting.MessagingMarshallable;
+import org.jboss.logging.Logger;
import org.jboss.remoting.InvocationRequest;
import org.jboss.remoting.ServerInvocationHandler;
import org.jboss.remoting.ServerInvoker;
@@ -50,20 +51,26 @@
public class CallbackManager implements ServerInvocationHandler
{
protected Map callbackHandlers;
-
+
+ private static final Logger log = Logger.getLogger(CallbackManager.class);
+
public CallbackManager()
{
callbackHandlers = new ConcurrentReaderHashMap();
}
- public void registerHandler(int consumerID, MessageCallbackHandler handler)
+ public void registerHandler(int serverID, int consumerID, MessageCallbackHandler handler)
{
- callbackHandlers.put(new Integer(consumerID), handler);
+ Long lookup = calcLookup(serverID, consumerID);
+
+ callbackHandlers.put(lookup, handler);
}
- public void unregisterHandler(int consumerID)
+ public void unregisterHandler(int serverID, int consumerID)
{
- callbackHandlers.remove(new Integer(consumerID));
+ Long lookup = calcLookup(serverID, consumerID);
+
+ callbackHandlers.remove(lookup);
}
public void addListener(InvokerCallbackHandler arg0)
@@ -78,10 +85,18 @@
int consumerID = dr.getConsumerID();
+ int serverID = dr.getServerID();
+
+ Long lookup = calcLookup(serverID, consumerID);
+
List msgs = dr.getMessages();
+ //In 1.0.x there is only one callback server per protocol
+ //So we need to key on the server id too to make sure messages make it to the correct
+ //connection
+
MessageCallbackHandler handler =
- (MessageCallbackHandler)callbackHandlers.get(new Integer(consumerID));
+ (MessageCallbackHandler)callbackHandlers.get(lookup);
if (handler == null)
{
@@ -102,5 +117,18 @@
public void setMBeanServer(MBeanServer arg0)
{
}
+
+ private Long calcLookup(int serverId, int consumerId)
+ {
+ long id1 = serverId;
+
+ id1 <<= 32;
+
+ long id2 = (consumerId + Integer.MIN_VALUE);
+
+ long lookup = id1 | id2;
+
+ return new Long(lookup);
+ }
}
Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/state/ConnectionState.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/state/ConnectionState.java 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/client/state/ConnectionState.java 2007-04-20 15:44:23 UTC (rev 2594)
@@ -52,11 +52,11 @@
private MessageIdGenerator idGenerator;
- private String serverID;
+ private int serverID;
private Version versionToUse;
- public ConnectionState(String serverID, ConnectionDelegate delegate,
+ public ConnectionState(int serverID, ConnectionDelegate delegate,
JMSRemotingConnection remotingConnection, Version versionToUse,
ResourceManager rm, MessageIdGenerator gen)
throws Exception
@@ -98,7 +98,7 @@
return versionToUse;
}
- public String getServerID()
+ public int getServerID()
{
return serverID;
}
Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/ServerPeer.java 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/ServerPeer.java 2007-04-20 15:44:23 UTC (rev 2594)
@@ -109,6 +109,8 @@
private int maxDeliveryAttempts = 10;
private String dlqName;
+
+ private int serverIdAsInt;
// wired components
@@ -147,6 +149,16 @@
String defaultQueueJNDIContext,
String defaultTopicJNDIContext) throws Exception
{
+ try
+ {
+ serverIdAsInt = Integer.valueOf(serverPeerID).intValue();
+ }
+ catch (NumberFormatException e)
+ {
+ throw new IllegalArgumentException("Server peer id must be a valid integer");
+ }
+
+
this.serverPeerID = serverPeerID;
this.defaultQueueJNDIContext = defaultQueueJNDIContext;
this.defaultTopicJNDIContext = defaultTopicJNDIContext;
@@ -663,6 +675,11 @@
}
}
}
+
+ public int getServerIDAsInt()
+ {
+ return serverIdAsInt;
+ }
public String toString()
{
Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2007-04-20 15:44:23 UTC (rev 2594)
@@ -92,7 +92,7 @@
ClientConnectionFactoryDelegate delegate =
new ClientConnectionFactoryDelegate(id, locatorURI, serverPeer.getVersion(),
- serverPeer.getServerPeerID(), clientPing);
+ serverPeer.getServerIDAsInt(), clientPing);
ConnectionFactoryAdvised connFactoryAdvised;
Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ClientDelivery.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ClientDelivery.java 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ClientDelivery.java 2007-04-20 15:44:23 UTC (rev 2594)
@@ -57,6 +57,8 @@
private List msgs;
private int consumerID;
+
+ private int serverID;
// Constructors --------------------------------------------------
@@ -64,11 +66,13 @@
{
}
- public ClientDelivery(List msgs, int consumerID)
+ public ClientDelivery(List msgs, int consumerID, int serverID)
{
this.msgs = msgs;
- this.consumerID = consumerID;
+ this.consumerID = consumerID;
+
+ this.serverID = serverID;
}
// Externalizable implementation
@@ -78,6 +82,8 @@
{
out.writeInt(consumerID);
+ out.writeInt(serverID);
+
out.writeInt(msgs.size());
Iterator iter = msgs.iterator();
@@ -98,6 +104,8 @@
{
consumerID = in.readInt();
+ serverID = in.readInt();
+
int numMessages = in.readInt();
msgs = new ArrayList(numMessages);
@@ -129,6 +137,11 @@
{
return consumerID;
}
+
+ public int getServerID()
+ {
+ return serverID;
+ }
// Package protected ---------------------------------------------
Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2007-04-20 15:44:23 UTC (rev 2594)
@@ -795,7 +795,7 @@
log.trace(sb.toString());
}
- ClientDelivery del = new ClientDelivery(list, id);
+ ClientDelivery del = new ClientDelivery(list, id, connection.getServerPeer().getServerIDAsInt());
// TODO How can we ensure that messages for the same consumer aren't delivered
// concurrently to the same consumer on different threads?
Modified: branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
===================================================================
--- branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java 2007-04-20 15:44:23 UTC (rev 2594)
@@ -145,16 +145,16 @@
assertTrue(rm1 == rm2);
- assertTrue(ResourceManagerFactory.instance.containsResourceManager(state2.getServerID()));
+ assertTrue(ResourceManagerFactory.instance.containsResourceManager(String.valueOf(state2.getServerID())));
conn1.close();
//Check reference counting
- assertTrue(ResourceManagerFactory.instance.containsResourceManager(state2.getServerID()));
+ assertTrue(ResourceManagerFactory.instance.containsResourceManager(String.valueOf(state2.getServerID())));
conn2.close();
- assertFalse(ResourceManagerFactory.instance.containsResourceManager(state2.getServerID()));
+ assertFalse(ResourceManagerFactory.instance.containsResourceManager(String.valueOf(state2.getServerID())));
}
public void testMessageIDGeneratorsForSameServer() throws Exception
@@ -179,16 +179,16 @@
assertTrue(gen1 == gen2);
- assertTrue(MessageIdGeneratorFactory.instance.containsMessageIdGenerator(state2.getServerID()));
+ assertTrue(MessageIdGeneratorFactory.instance.containsMessageIdGenerator(String.valueOf(state2.getServerID())));
conn1.close();
//Check reference counting
- assertTrue(MessageIdGeneratorFactory.instance.containsMessageIdGenerator(state2.getServerID()));
+ assertTrue(MessageIdGeneratorFactory.instance.containsMessageIdGenerator(String.valueOf(state2.getServerID())));
conn2.close();
- assertFalse(MessageIdGeneratorFactory.instance.containsMessageIdGenerator(state2.getServerID()));
+ assertFalse(MessageIdGeneratorFactory.instance.containsMessageIdGenerator(String.valueOf(state2.getServerID())));
}
Modified: branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java
===================================================================
--- branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java 2007-04-19 16:48:02 UTC (rev 2593)
+++ branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java 2007-04-20 15:44:23 UTC (rev 2594)
@@ -1100,6 +1100,7 @@
public void testCallback() throws Exception
{
+ int serverID = 716267;
int consumerID = 12345678;
JBossMessage m1 = new JBossMessage(123);
@@ -1120,7 +1121,7 @@
msgs.add(del2);
msgs.add(del3);
- ClientDelivery dr = new ClientDelivery(msgs, consumerID);
+ ClientDelivery dr = new ClientDelivery(msgs, consumerID, serverID);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -1147,8 +1148,10 @@
assertEquals(JMSWireFormat.CALLBACK, ois.readByte());
//Next int should be consumer id
- assertEquals(12345678, ois.readInt());
+ assertEquals(consumerID, ois.readInt());
+ assertEquals(serverID, ois.readInt());
+
//Next int should be number of messages
assertEquals(3, ois.readInt());
@@ -1220,6 +1223,8 @@
assertEquals(consumerID, dr2.getConsumerID());
+ assertEquals(serverID, dr2.getServerID());
+
MessageProxy p1 = (MessageProxy)msgs2.get(0);
MessageProxy p2 = (MessageProxy)msgs2.get(1);
MessageProxy p3 = (MessageProxy)msgs2.get(2);
More information about the jboss-cvs-commits
mailing list