[hornetq-commits] JBoss hornetq SVN: r9562 - in branches/2_2_0_HA_Improvements/src/main/org/hornetq/core: server/cluster/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2010-08-18 10:49:50 -0400 (Wed, 18 Aug 2010)
New Revision: 9562

Modified:
   branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
   branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
   branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java
   branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/DelegatingSession.java
   branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java
Log:
tidied up

Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java	2010-08-18 14:03:20 UTC (rev 9561)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java	2010-08-18 14:49:50 UTC (rev 9562)
@@ -100,11 +100,11 @@
 
    private final Object exitLock = new Object();
 
-   private final Object createSessionLock = new CreateSessionLock();
+   private final Object createSessionLock = new Object();
 
    private boolean inCreateSession;
 
-   private final Object failoverLock = new FailoverLock();
+   private final Object failoverLock = new Object();
 
    private final ExecutorFactory orderedExecutorFactory;
 
@@ -1283,14 +1283,4 @@
          cancelled = true;
       }
    }
-
-   class CreateSessionLock
-   {
-
-   }
-
-   class FailoverLock
-   {
-
-   }
 }

Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java	2010-08-18 14:03:20 UTC (rev 9561)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java	2010-08-18 14:49:50 UTC (rev 9562)
@@ -841,11 +841,6 @@
       doCleanup(false);
    }
 
-   public synchronized void cleanUp() throws Exception
-   {
-      cleanUp(false);
-   }
-
    public synchronized void cleanUp(boolean failingOver) throws Exception
    {
       if (closed)
@@ -1489,7 +1484,7 @@
    {
       try
       {
-         cleanUp();
+         cleanUp(false);
       }
       catch (Exception e)
       {

Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java	2010-08-18 14:03:20 UTC (rev 9561)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java	2010-08-18 14:49:50 UTC (rev 9562)
@@ -60,8 +60,6 @@
 
    RemotingConnection getConnection();
 
-   void cleanUp() throws Exception;
-
    void cleanUp(boolean failingOver) throws Exception;
 
    void returnBlocking();

Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/DelegatingSession.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/DelegatingSession.java	2010-08-18 14:03:20 UTC (rev 9561)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/DelegatingSession.java	2010-08-18 14:49:50 UTC (rev 9562)
@@ -134,10 +134,6 @@
       session.forceDelivery(consumerID, sequence);
    }
 
-   public void cleanUp() throws Exception
-   {
-      session.cleanUp();
-   }
 
    public void cleanUp(boolean failingOver) throws Exception
    {

Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java	2010-08-18 14:03:20 UTC (rev 9561)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionBridge.java	2010-08-18 14:49:50 UTC (rev 9562)
@@ -234,7 +234,7 @@
    {
       try
       {
-         session.cleanUp();
+         session.cleanUp(false);
       }
       catch (Exception e)
       {