[jboss-cvs] JBoss Messaging SVN: r2099 - in trunk/src/main/org/jboss/jms: server/endpoint and 1 other directory.

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

Author: ovidiu.feodorov at jboss.com
Date: 2007-01-30 02:30:04 -0500 (Tue, 30 Jan 2007)
New Revision: 2099

Modified:
   trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
Log:
minor reformatting

Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java	2007-01-30 07:21:00 UTC (rev 2098)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java	2007-01-30 07:30:04 UTC (rev 2099)
@@ -46,7 +46,6 @@
 import org.jboss.jms.server.endpoint.Ack;
 import org.jboss.jms.server.endpoint.Cancel;
 import org.jboss.jms.server.endpoint.DeliveryInfo;
-import org.jboss.logging.Logger;
 import org.jboss.remoting.Client;
 
 /**
@@ -66,9 +65,6 @@
 
    private static final long serialVersionUID = -8096852898620279131L;
    
-   private static final Logger log = Logger.getLogger(ClientSessionDelegate.class);
-   
-
    // Attributes -----------------------------------------------------------------------------------
 
    // Static ---------------------------------------------------------------------------------------
@@ -485,7 +481,6 @@
       return ((ConnectionState)state.getParent()).getRemotingConnection().getRemotingClient();
    }
 
-
    // Package Private ------------------------------------------------------------------------------
 
    // Private --------------------------------------------------------------------------------------

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2007-01-30 07:21:00 UTC (rev 2098)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2007-01-30 07:30:04 UTC (rev 2099)
@@ -333,7 +333,8 @@
                   
                   if (counter == null)
                   {
-                     throw new IllegalStateException("Cannot find counter to unregister " + counterName);
+                     throw new IllegalStateException(
+                        "Cannot find counter to unregister " + counterName);
                   }
                }
                else
@@ -570,7 +571,8 @@
       {
          if (sessions.remove(new Integer(sessionId)) == null)
          {
-            throw new IllegalStateException("Cannot find session with id " + sessionId + " to remove");
+            throw new IllegalStateException("Cannot find session with id " +
+               sessionId + " to remove");
          }
       }
    }
@@ -721,7 +723,8 @@
             
             if (session == null)
             {               
-               throw new IllegalStateException("Cannot find session with id " + sessionState.getSessionId());
+               throw new IllegalStateException("Cannot find session with id " +
+                  sessionState.getSessionId());
             }
 
             session.acknowledgeTransactionally(sessionState.getAcks(), tx);

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2007-01-30 07:21:00 UTC (rev 2098)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2007-01-30 07:30:04 UTC (rev 2099)
@@ -246,22 +246,21 @@
            
          try
          {
-            // one way invocation, no acknowledgment sent back by the client
-            if (trace) { log.trace(this + " submitting message " + message + " to the remoting layer to be sent asynchronously"); }
-            
             //FIXME - due a design (flaw??) in the socket based transports, they use a pool of TCP
-            //connections, so subsequent invocations can end up using different underlying connections
-            //meaning that later invocations can overtake earlier invocations, if there are more than
-            //one user concurrently invoking on the same transport            
-            //We need someway of pinning the client object to the underlying invocation            
-            //For now we just serialize all access so that only the first connection in the pool
-            //is ever used - bit this is far from ideal!!!            
-            //See http://jira.jboss.com/jira/browse/JBMESSAGING-789
+            // connections, so subsequent invocations can end up using different underlying
+            // connections meaning that later invocations can overtake earlier invocations, if there
+            // are more than one user concurrently invoking on the same transport. We need someway
+            // of pinning the client object to the underlying invocation. For now we just serialize
+            // all access so that only the first connection in the pool is ever used - bit this is
+            // far from ideal!!!
+            // See http://jira.jboss.com/jira/browse/JBMESSAGING-789
             
             Invoker invoker = callbackHandler.getCallbackClient().getInvoker();
             
             synchronized (invoker)
-            {            
+            {
+               // one way invocation, no acknowledgment sent back by the client
+               if (trace) { log.trace(this + " submitting message " + message + " to the remoting layer to be sent asynchronously"); }
                callbackHandler.handleCallbackOneway(callback);
             }
          }