[jboss-cvs] JBoss Messaging SVN: r4125 - in trunk: src/main/org/jboss/messaging/core/remoting/impl/wireformat and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 28 10:20:12 EDT 2008
Author: jmesnil
Date: 2008-04-28 10:20:12 -0400 (Mon, 28 Apr 2008)
New Revision: 4125
Modified:
trunk/src/main/org/jboss/messaging/core/remoting/Packet.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaInspectorTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/TestSupport.java
trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java
Log:
moved NO_ID_SET constant to Packet interface
Modified: trunk/src/main/org/jboss/messaging/core/remoting/Packet.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/Packet.java 2008-04-28 14:17:51 UTC (rev 4124)
+++ trunk/src/main/org/jboss/messaging/core/remoting/Packet.java 2008-04-28 14:20:12 UTC (rev 4125)
@@ -14,6 +14,8 @@
{
// Public --------------------------------------------------------
+ public static final long NO_ID_SET = -1L;
+
void setCorrelationID(long correlationID);
long getCorrelationID();
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java 2008-04-28 14:17:51 UTC (rev 4124)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java 2008-04-28 14:20:12 UTC (rev 4125)
@@ -17,10 +17,6 @@
{
// Constants -----------------------------------------------------
- public static final long NO_ID_SET = -1L;
-
- // Attributes ----------------------------------------------------
-
private long correlationID = NO_ID_SET;
private long targetID = NO_ID_SET;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-04-28 14:17:51 UTC (rev 4124)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-04-28 14:20:12 UTC (rev 4125)
@@ -235,7 +235,7 @@
}
// reply if necessary
- if (response == null && packet.getCorrelationID() != PacketImpl.NO_ID_SET)
+ if (response == null && packet.getCorrelationID() != Packet.NO_ID_SET)
{
response = new PacketImpl(NULL);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java 2008-04-28 14:17:51 UTC (rev 4124)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java 2008-04-28 14:20:12 UTC (rev 4125)
@@ -80,7 +80,7 @@
}
// reply if necessary
- if (response == null && packet.getCorrelationID() != PacketImpl.NO_ID_SET)
+ if (response == null && packet.getCorrelationID() != Packet.NO_ID_SET)
{
response = new PacketImpl(NULL);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java 2008-04-28 14:17:51 UTC (rev 4124)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java 2008-04-28 14:20:12 UTC (rev 4125)
@@ -73,7 +73,7 @@
}
// reply if necessary
- if (response == null && packet.getCorrelationID() != PacketImpl.NO_ID_SET)
+ if (response == null && packet.getCorrelationID() != Packet.NO_ID_SET)
{
response = new PacketImpl(NULL);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java 2008-04-28 14:17:51 UTC (rev 4124)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java 2008-04-28 14:20:12 UTC (rev 4125)
@@ -27,7 +27,6 @@
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
/**
*
@@ -67,7 +66,7 @@
}
// reply if necessary
- if (response != null && packet.getCorrelationID() != PacketImpl.NO_ID_SET)
+ if (response != null && packet.getCorrelationID() != Packet.NO_ID_SET)
{
response.normalize(packet);
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-04-28 14:17:51 UTC (rev 4124)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-04-28 14:20:12 UTC (rev 4125)
@@ -72,7 +72,7 @@
}
// reply if necessary
- if (response == null && packet.getCorrelationID() != PacketImpl.NO_ID_SET)
+ if (response == null && packet.getCorrelationID() != Packet.NO_ID_SET)
{
response = new PacketImpl(NULL);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-04-28 14:17:51 UTC (rev 4124)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-04-28 14:20:12 UTC (rev 4125)
@@ -241,7 +241,7 @@
}
// reply if necessary
- if (response == null && packet.getCorrelationID() != PacketImpl.NO_ID_SET)
+ if (response == null && packet.getCorrelationID() != Packet.NO_ID_SET)
{
response = new PacketImpl(NULL);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaInspectorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaInspectorTest.java 2008-04-28 14:17:51 UTC (rev 4124)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/MinaInspectorTest.java 2008-04-28 14:20:12 UTC (rev 4125)
@@ -13,6 +13,7 @@
import junit.framework.TestCase;
+import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.impl.mina.MinaInspector;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
@@ -49,7 +50,7 @@
public void testGetRequestIdForAbstractPacketWhichIsNotRequest()
{
- PacketImpl packet = new PacketImpl(NULL);
+ Packet packet = new PacketImpl(NULL);
packet.setTargetID(23);
assertFalse(packet.isRequest());
assertNull(inspector.getRequestId(packet));
@@ -57,7 +58,7 @@
public void testGetRequestIdForAbstractPacketWhichIsRequest()
{
- PacketImpl packet = new PacketImpl(NULL);
+ Packet packet = new PacketImpl(NULL);
packet.setTargetID(23);
packet.setCorrelationID(System.currentTimeMillis());
assertTrue(packet.isRequest());
@@ -79,7 +80,7 @@
public void testGetResponseTypeForAbstractPacket()
{
- PacketImpl packet = new PacketImpl(NULL);
+ Packet packet = new PacketImpl(NULL);
assertEquals(WHOLE, inspector.getResponseType(packet));
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/TestSupport.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/TestSupport.java 2008-04-28 14:17:51 UTC (rev 4124)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/mina/TestSupport.java 2008-04-28 14:20:12 UTC (rev 4125)
@@ -16,7 +16,7 @@
{
// Constants -----------------------------------------------------
- public static final int MANY_MESSAGES = 500;
+ public static final int MANY_MESSAGES = 50000;
public static final int KEEP_ALIVE_INTERVAL = 2; // in seconds
Modified: trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java 2008-04-28 14:17:51 UTC (rev 4124)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/core/remoting/mina/PacketStressTest.java 2008-04-28 14:20:12 UTC (rev 4125)
@@ -24,7 +24,6 @@
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.mina.MinaConnector;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
-import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.BytesPacket;
/**
@@ -89,7 +88,7 @@
NIOSession session = connector.connect();
byte[] payloadBytes = generatePayload(PAYLOAD);
- PacketImpl packet = new BytesPacket(payloadBytes);
+ Packet packet = new BytesPacket(payloadBytes);
packet.setTargetID(handlerID);
long start = System.currentTimeMillis();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java 2008-04-28 14:17:51 UTC (rev 4124)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java 2008-04-28 14:20:12 UTC (rev 4125)
@@ -359,7 +359,7 @@
public void testNullPacket() throws Exception
{
- PacketImpl packet = new PacketImpl(NULL);
+ Packet packet = new PacketImpl(NULL);
long cid = randomLong();
packet.setCorrelationID(cid);
packet.setTargetID(randomLong());
@@ -623,7 +623,7 @@
public void testStartConnectionMessage() throws Exception
{
- PacketImpl packet = new PacketImpl(CONN_START);
+ Packet packet = new PacketImpl(CONN_START);
AbstractPacketCodec codec = PacketCodecFactory
.createCodecForEmptyPacket(CONN_START);
@@ -634,7 +634,7 @@
public void testStopConnectionMessage() throws Exception
{
- PacketImpl packet = new PacketImpl(CONN_STOP);
+ Packet packet = new PacketImpl(CONN_STOP);
AbstractPacketCodec codec = PacketCodecFactory
.createCodecForEmptyPacket(CONN_STOP);
@@ -725,7 +725,7 @@
public void testSessionCommitMessage() throws Exception
{
- PacketImpl message = new PacketImpl(SESS_COMMIT);
+ Packet message = new PacketImpl(SESS_COMMIT);
AbstractPacketCodec codec = PacketCodecFactory
.createCodecForEmptyPacket(SESS_COMMIT);
@@ -736,7 +736,7 @@
public void testSessionRollbackMessage() throws Exception
{
- PacketImpl message = new PacketImpl(SESS_ROLLBACK);
+ Packet message = new PacketImpl(SESS_ROLLBACK);
AbstractPacketCodec codec = PacketCodecFactory
.createCodecForEmptyPacket(SESS_ROLLBACK);
@@ -747,7 +747,7 @@
public void testSessionRecoverMessage() throws Exception
{
- PacketImpl message = new PacketImpl(SESS_RECOVER);
+ Packet message = new PacketImpl(SESS_RECOVER);
AbstractPacketCodec codec = PacketCodecFactory
.createCodecForEmptyPacket(SESS_RECOVER);
@@ -758,7 +758,7 @@
public void testCloseMessage() throws Exception
{
- PacketImpl message = new PacketImpl(CLOSE);
+ Packet message = new PacketImpl(CLOSE);
AbstractPacketCodec codec = PacketCodecFactory
.createCodecForEmptyPacket(CLOSE);
@@ -802,7 +802,7 @@
public void testBrowserResetMessage() throws Exception
{
- PacketImpl message = new PacketImpl(SESS_BROWSER_RESET);
+ Packet message = new PacketImpl(SESS_BROWSER_RESET);
AbstractPacketCodec codec = PacketCodecFactory
.createCodecForEmptyPacket(SESS_BROWSER_RESET);
@@ -813,7 +813,7 @@
public void testBrowserHasNextMessageRequest() throws Exception
{
- PacketImpl request = new PacketImpl(SESS_BROWSER_HASNEXTMESSAGE);
+ Packet request = new PacketImpl(SESS_BROWSER_HASNEXTMESSAGE);
AbstractPacketCodec codec = PacketCodecFactory
.createCodecForEmptyPacket(SESS_BROWSER_HASNEXTMESSAGE);
@@ -840,7 +840,7 @@
public void testBrowserNextMessageRequest() throws Exception
{
- PacketImpl request = new PacketImpl(SESS_BROWSER_NEXTMESSAGE);
+ Packet request = new PacketImpl(SESS_BROWSER_NEXTMESSAGE);
AbstractPacketCodec codec = PacketCodecFactory
.createCodecForEmptyPacket(SESS_BROWSER_NEXTMESSAGE);
@@ -949,7 +949,7 @@
public void testSessionXAGetInDoubtXidsMessage() throws Exception
{
- PacketImpl request = new PacketImpl(SESS_XA_INDOUBT_XIDS);
+ Packet request = new PacketImpl(SESS_XA_INDOUBT_XIDS);
AbstractPacketCodec codec = createCodecForEmptyPacket(SESS_XA_INDOUBT_XIDS);
Packet decodedPacket = encodeAndCheckBytesAndDecode(request, codec);
@@ -980,7 +980,7 @@
public void testSessionXAGetTimeoutMessage() throws Exception
{
- PacketImpl message = new PacketImpl(SESS_XA_GET_TIMEOUT);
+ Packet message = new PacketImpl(SESS_XA_GET_TIMEOUT);
AbstractPacketCodec codec = createCodecForEmptyPacket(PacketType.SESS_XA_GET_TIMEOUT);
Packet decodedPacket = encodeAndCheckBytesAndDecode(message, codec);
@@ -1125,7 +1125,7 @@
public void testSessionXASuspendMessage() throws Exception
{
- PacketImpl message = new PacketImpl(SESS_XA_SUSPEND);
+ Packet message = new PacketImpl(SESS_XA_SUSPEND);
AbstractPacketCodec codec = PacketCodecFactory
.createCodecForEmptyPacket(PacketType.SESS_XA_SUSPEND);
More information about the jboss-cvs-commits
mailing list