[jboss-cvs] JBoss Messaging SVN: r1720 - in branches/Branch_Client_Failover_Experiment/src/main/org/jboss: jms/client/delegate jms/server/endpoint jms/server/endpoint/advised messaging/core/plugin/contract messaging/core/plugin/postoffice/cluster

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

Author: clebert.suconic at jboss.com
Date: 2006-12-07 17:09:40 -0500 (Thu, 07 Dec 2006)
New Revision: 1720

Modified:
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ConnectionFactoryEndpoint.java
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/contract/Replicator.java
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
Log:
Removing a stupid idea from my brain flatulence :-)

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java	2006-12-07 20:44:55 UTC (rev 1719)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java	2006-12-07 22:09:40 UTC (rev 1720)
@@ -154,11 +154,6 @@
       throw new IllegalStateException("This invocation should not be handled here!");
    }
 
-   public boolean stillAround(int node) throws JMSException
-   {
-      throw new IllegalStateException("This invocation should not be handled here!");
-   }
-
    // Public --------------------------------------------------------
 
    public synchronized Object invoke(Invocation invocation) throws Throwable

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ConnectionFactoryEndpoint.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ConnectionFactoryEndpoint.java	2006-12-07 20:44:55 UTC (rev 1719)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ConnectionFactoryEndpoint.java	2006-12-07 22:09:40 UTC (rev 1720)
@@ -47,21 +47,5 @@
    /** Return the node that should take over a given node */
    int getFailoverNode(int node) throws JMSException;
 
-   /**
-    * This method will be used by HAAspect interceptor to ask other servers if
-    * a given server still around.
-    *
-    * This will be useful on retries from client2server communication. If a communication exception happened
-    * on the communication with a given server we will check with other peers to confirm if the server really
-    * diead before restabilishing a connection.
-    *
-    * This method is not very useful on leasing but it will be usefull on Exception listeners.
-    *
-    * Say, if a communication exception happens on an interceptor, the interceptor could ask other servers
-    * about their current membership and decide about a retry or a failover. 
-    *
-    * TODO: a better name for this method?
-    * */
-   boolean stillAround(int node) throws JMSException;
 }
 

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2006-12-07 20:44:55 UTC (rev 1719)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2006-12-07 22:09:40 UTC (rev 1720)
@@ -152,20 +152,6 @@
    }
 
 
-   // TODO: Better name
-   public boolean stillAround(int node) throws JMSException
-   {
-      try
-      {
-         ServerPeer peer = (ServerPeer )serverPeer.getInstance();
-         return peer.getReplicator().stillAround(node);
-      }
-      catch (Throwable t)
-      {
-         throw ExceptionUtil.handleJMSInvocation(t, this + " stillAround");
-      }
-   }
-
    public byte[] getClientAOPConfig() throws JMSException
    {
       try

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java	2006-12-07 20:44:55 UTC (rev 1719)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java	2006-12-07 22:09:40 UTC (rev 1720)
@@ -78,12 +78,6 @@
       return endpoint.getFailoverNode(node);
    }
 
-   // TODO: find a better name... look at javadoc on ConnectionFactoryInterface
-   public boolean stillAround(int node) throws JMSException
-   {
-      return endpoint.stillAround(node);
-   }
-
    // AdvisedSupport override ---------------------------------------
 
    public Object getEndpoint()

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/contract/Replicator.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/contract/Replicator.java	2006-12-07 20:44:55 UTC (rev 1719)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/contract/Replicator.java	2006-12-07 22:09:40 UTC (rev 1720)
@@ -81,16 +81,4 @@
    int getFailoverNodeID(int nodeID);
 
 
-   /**
-    *
-    * This method will be used by HAAspect interceptor to ask other servers if
-    * a given server still around.
-    *
-    * This will be useful on retries from client2server communication. If a communication exception happened
-    * on the communication with a given server we will check with other peers to confirm if the server really
-    * diead before restabilishing a connection
-    *
-    * TODO: a better name for this method?
-    * */
-   public boolean stillAround(int nodeId);
 }

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java	2006-12-07 20:44:55 UTC (rev 1719)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java	2006-12-07 22:09:40 UTC (rev 1720)
@@ -608,15 +608,6 @@
       }
    }
 
-   // TODO: find a better name
-   public boolean stillAround(int nodeId)
-   {
-      synchronized (failoverMap)
-      {
-         return failoverMap.get(new Integer(nodeId))!=null;
-      }
-   }
-
    // Replicator implementation --------------------------------------------------------------------------
    
    public Map get(Serializable key) throws Exception