[jboss-cvs] JBoss Messaging SVN: r6080 - trunk/src/main/org/jboss/messaging/core/client/impl.

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

Author: jmesnil
Date: 2009-03-13 12:25:27 -0400 (Fri, 13 Mar 2009)
New Revision: 6080

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
Log:
code cleanup

* removed useless state field
* removed unused ClientXAState class
* removed verbose error log in prepare(Xid)

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2009-03-13 15:57:44 UTC (rev 6079)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2009-03-13 16:25:27 UTC (rev 6080)
@@ -125,8 +125,6 @@
 
    private final boolean xa;
 
-   private final ClientXAState state = null;
-
    private final Executor executor;
 
    private volatile RemotingConnection remotingConnection;
@@ -1002,8 +1000,6 @@
       {
          SessionXAResponseMessage response = (SessionXAResponseMessage)channel.sendBlocking(packet);
 
-         log.error(response.getMessage() + " code " + response.getResponseCode());
-
          if (response.isError())
          {
             throw new XAException(response.getResponseCode());
@@ -1110,13 +1106,6 @@
    public void start(final Xid xid, final int flags) throws XAException
    {
       checkXA();
-      if (state != null)
-      {
-         log.error("XA operation failed Cannot start, session is already doing work in a transaction " + state.xid +
-                   "code:" +
-                   XAException.XAER_PROTO);
-         throw new XAException(XAException.XAER_PROTO);
-      }
       try
       {
          Packet packet;
@@ -1353,16 +1342,4 @@
          consumer.flushAcks();
       }
    }
-
-   class ClientXAState
-   {
-      final Xid xid;
-
-      int state;
-
-      public ClientXAState(final Xid xid)
-      {
-         this.xid = xid;
-      }
-   }
 }