[jboss-cvs] JBoss Messaging SVN: r4122 - in trunk: src/main/org/jboss/messaging/core/remoting and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 28 04:50:28 EDT 2008
Author: jmesnil
Date: 2008-04-28 04:50:28 -0400 (Mon, 28 Apr 2008)
New Revision: 4122
Modified:
trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/Packet.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/AbstractPacketCodec.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/unit/core/remoting/impl/wireformat/PacketTypeTest.java
Log:
removed Packet.isOneWay() and replaced it by checking if the packet's correlationID is set
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java 2008-04-25 15:33:31 UTC (rev 4121)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java 2008-04-28 08:50:28 UTC (rev 4122)
@@ -219,7 +219,6 @@
{
assert packet != null;
checkConnected();
- packet.setOneWay(oneWay);
if (oneWay)
{
Modified: trunk/src/main/org/jboss/messaging/core/remoting/Packet.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/Packet.java 2008-04-25 15:33:31 UTC (rev 4121)
+++ trunk/src/main/org/jboss/messaging/core/remoting/Packet.java 2008-04-28 08:50:28 UTC (rev 4122)
@@ -27,10 +27,6 @@
long getExecutorID();
void setExecutorID(long executorID);
-
- void setOneWay(boolean oneWay);
-
- boolean isOneWay();
void normalize(Packet other);
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/AbstractPacketCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/AbstractPacketCodec.java 2008-04-25 15:33:31 UTC (rev 4121)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/AbstractPacketCodec.java 2008-04-28 08:50:28 UTC (rev 4122)
@@ -42,7 +42,7 @@
public static final int CHAR_LENGTH = 2;
public static final int HEADER_LENGTH =
- BYTE_LENGTH + LONG_LENGTH + LONG_LENGTH + LONG_LENGTH + BOOLEAN_LENGTH;
+ BYTE_LENGTH + LONG_LENGTH + LONG_LENGTH + LONG_LENGTH;
private static final Logger log = Logger.getLogger(AbstractPacketCodec.class);
@@ -82,7 +82,6 @@
buf.putLong(correlationID);
buf.putLong(targetID);
buf.putLong(executorID);
- buf.putBoolean(packet.isOneWay());
encodeBody(packet, buf);
@@ -115,14 +114,13 @@
long executorID = buffer.getLong();
if (executorID == -1)
executorID = targetID;
- boolean oneWay = buffer.getBoolean();
Packet packet = decodeBody(buffer);
packet.setCorrelationID(correlationID);
packet.setTargetID(targetID);
- packet.setExecutorID(executorID);
- packet.setOneWay(oneWay);
+ packet.setExecutorID(executorID);
+
out.write(packet);
}
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-25 15:33:31 UTC (rev 4121)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/PacketImpl.java 2008-04-28 08:50:28 UTC (rev 4122)
@@ -6,7 +6,6 @@
*/
package org.jboss.messaging.core.remoting.impl.wireformat;
-import org.jboss.messaging.core.client.impl.RemotingConnection;
import org.jboss.messaging.core.remoting.Packet;
/**
@@ -30,14 +29,6 @@
private final PacketType type;
- /**
- * <code>oneWay</code> is <code>true</code> when the packet is sent "one way"
- * by the client which does not expect any response to it.
- *
- * @see RemotingConnection#sendOneWay(AbstractPacket)
- */
- private boolean oneWay = false;
-
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
@@ -86,16 +77,6 @@
this.executorID = executorID;
}
- public void setOneWay(boolean oneWay)
- {
- this.oneWay = oneWay;
- }
-
- public boolean isOneWay()
- {
- return oneWay;
- }
-
public void normalize(Packet other)
{
assert other != null;
@@ -123,7 +104,7 @@
{
return "PACKET[type=" + type
+ ", correlationID=" + correlationID + ", targetID=" + targetID
- + ", executorID=" + executorID + ", oneWay=" + oneWay;
+ + ", executorID=" + executorID;
}
// Protected -----------------------------------------------------
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-25 15:33:31 UTC (rev 4121)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-04-28 08:50:28 UTC (rev 4122)
@@ -41,6 +41,7 @@
import org.jboss.messaging.core.remoting.Packet;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.impl.codec.AbstractPacketCodec;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketImpl;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
@@ -234,7 +235,7 @@
}
// reply if necessary
- if (response == null && packet.isOneWay() == false)
+ if (response == null && packet.getCorrelationID() != PacketImpl.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-25 15:33:31 UTC (rev 4121)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java 2008-04-28 08:50:28 UTC (rev 4122)
@@ -80,7 +80,7 @@
}
// reply if necessary
- if (response == null && packet.isOneWay() == false)
+ if (response == null && packet.getCorrelationID() != PacketImpl.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-25 15:33:31 UTC (rev 4121)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java 2008-04-28 08:50:28 UTC (rev 4122)
@@ -73,7 +73,7 @@
}
// reply if necessary
- if (response == null && packet.isOneWay() == false)
+ if (response == null && packet.getCorrelationID() != PacketImpl.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-25 15:33:31 UTC (rev 4121)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java 2008-04-28 08:50:28 UTC (rev 4122)
@@ -27,6 +27,7 @@
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;
/**
*
@@ -66,7 +67,7 @@
}
// reply if necessary
- if (response != null && !packet.isOneWay())
+ if (response != null && packet.getCorrelationID() != PacketImpl.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-25 15:33:31 UTC (rev 4121)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-04-28 08:50:28 UTC (rev 4122)
@@ -72,7 +72,7 @@
}
// reply if necessary
- if (response == null && packet.isOneWay() == false)
+ if (response == null && packet.getCorrelationID() != PacketImpl.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-25 15:33:31 UTC (rev 4121)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-04-28 08:50:28 UTC (rev 4122)
@@ -241,7 +241,7 @@
}
// reply if necessary
- if (response == null && packet.isOneWay() == false)
+ if (response == null && packet.getCorrelationID() != PacketImpl.NO_ID_SET)
{
response = new PacketImpl(NULL);
}
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-25 15:33:31 UTC (rev 4121)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/wireformat/PacketTypeTest.java 2008-04-28 08:50:28 UTC (rev 4122)
@@ -279,12 +279,10 @@
long correlationID = buffer.getLong();
long targetID = buffer.getLong();
long executorID = buffer.getLong();
- boolean oneWay = buffer.getBoolean();
assertEquals(packet.getCorrelationID(), correlationID);
assertEquals(packet.getTargetID(), targetID);
assertEquals(packet.getExecutorID(), executorID);
- assertEquals(oneWay, packet.isOneWay());
}
private static void checkBody(RemotingBuffer buffer, int bodyLength,
More information about the jboss-cvs-commits
mailing list