[jboss-cvs] JBoss Messaging SVN: r5294 - in trunk/src/main/org/jboss/messaging/core: remoting/impl/wireformat and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2008-11-06 12:56:25 -0500 (Thu, 06 Nov 2008)
New Revision: 5294

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerMessage.java
Log:
Removed address from SessionCreateProducerMessage


Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2008-11-06 17:50:33 UTC (rev 5293)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2008-11-06 17:56:25 UTC (rev 5294)
@@ -415,7 +415,7 @@
 
       if (producer == null)
       {
-         SessionCreateProducerMessage request = new SessionCreateProducerMessage(address, maxRate, autoGroupId);
+         SessionCreateProducerMessage request = new SessionCreateProducerMessage(maxRate, autoGroupId);
 
          SessionCreateProducerResponseMessage response = (SessionCreateProducerResponseMessage)channel.sendBlocking(request);
 

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerMessage.java	2008-11-06 17:50:33 UTC (rev 5293)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionCreateProducerMessage.java	2008-11-06 17:56:25 UTC (rev 5294)
@@ -36,7 +36,6 @@
 
    // Attributes ----------------------------------------------------
 
-   private SimpleString address;
 
    private int maxRate;
 
@@ -46,12 +45,10 @@
 
    // Constructors --------------------------------------------------
 
-   public SessionCreateProducerMessage(final SimpleString address, final int maxRate, final boolean autoGroupId)
+   public SessionCreateProducerMessage(final int maxRate, final boolean autoGroupId)
    {
       super(SESS_CREATEPRODUCER);
 
-      this.address = address;
-
       this.maxRate = maxRate;
 
       this.autoGroupId = autoGroupId;
@@ -68,18 +65,12 @@
    public String toString()
    {
       StringBuffer buff = new StringBuffer(getParentString());
-      buff.append(", address=" + address);
       buff.append(", maxrate=" + maxRate);
       buff.append(", autoGroupId=" + autoGroupId);
       buff.append("]");
       return buff.toString();
    }
 
-   public SimpleString getAddress()
-   {
-      return address;
-   }
-
    public int getMaxRate()
    {
       return maxRate;
@@ -92,14 +83,12 @@
 
    public void encodeBody(final MessagingBuffer buffer)
    {
-      buffer.putNullableSimpleString(address);
       buffer.putInt(maxRate);
       buffer.putBoolean(autoGroupId);
    }
 
    public void decodeBody(final MessagingBuffer buffer)
    {
-      address = buffer.getNullableSimpleString();
       maxRate = buffer.getInt();
       autoGroupId = buffer.getBoolean();
    }
@@ -113,9 +102,7 @@
 
       SessionCreateProducerMessage r = (SessionCreateProducerMessage)other;
 
-      return super.equals(other) && this.address == null ? r.address == null
-                                                        : this.address.equals(r.address) && this.maxRate == r.maxRate &&
-                                                          this.autoGroupId == autoGroupId;
+      return super.equals(other) && this.autoGroupId == autoGroupId;
    }
 
    // Package protected ---------------------------------------------