[hornetq-commits] JBoss hornetq SVN: r12295 - in trunk/hornetq-core/src/main/java/org/hornetq/core: server/cluster/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: borges
Date: 2012-03-13 08:05:00 -0400 (Tue, 13 Mar 2012)
New Revision: 12295

Modified:
   trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java
   trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorInternal.java
   trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
Log:
Delete dead code

Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java	2012-03-13 12:04:45 UTC (rev 12294)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java	2012-03-13 12:05:00 UTC (rev 12295)
@@ -187,8 +187,6 @@
 
    private TransportConfiguration clusterTransportConfiguration;
 
-   private boolean backup;
-
    private final Exception e = new Exception();
 
    // To be called when there are ServerLocator being finalized.
@@ -557,19 +555,13 @@
       });
    }
 
-   public Executor getExecutor()
-   {
-      return startExecutor;
-   }
-
-   /* (non-Javadoc)
-    * @see org.hornetq.api.core.client.ServerLocator#disableFinalizeCheck()
-    */
+   @Override
    public void disableFinalizeCheck()
    {
       finalizeCheck = false;
    }
 
+   @Override
    public ClientSessionFactoryInternal connect() throws Exception
    {
       synchronized (this)
@@ -586,9 +578,7 @@
       return (ClientSessionFactoryInternal)createSessionFactory();
    }
 
-   /* (non-Javadoc)
-    * @see org.hornetq.core.client.impl.ServerLocatorInternal#setAfterConnectionInternalListener(org.hornetq.core.client.impl.AfterConnectInternalListener)
-    */
+   @Override
    public void setAfterConnectionInternalListener(AfterConnectInternalListener listener)
    {
       this.afterConnectListener = listener;
@@ -1183,11 +1173,6 @@
       }
    }
 
-   public String getIdentity()
-   {
-      return identity;
-   }
-
    public void setIdentity(String identity)
    {
       this.identity = identity;
@@ -1223,16 +1208,6 @@
       this.clusterTransportConfiguration = tc;
    }
 
-   public boolean isBackup()
-   {
-      return backup;
-   }
-
-   public void setBackup(boolean backup)
-   {
-      this.backup = backup;
-   }
-
    @Override
    protected void finalize() throws Throwable
    {

Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorInternal.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorInternal.java	2012-03-13 12:04:45 UTC (rev 12294)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorInternal.java	2012-03-13 12:05:00 UTC (rev 12295)
@@ -30,26 +30,22 @@
 public interface ServerLocatorInternal extends ServerLocator
 {
    void start(Executor executor) throws Exception;
-   
-   Executor getExecutor();
-   
+
    void factoryClosed(final ClientSessionFactory factory);
-   
+
    AfterConnectInternalListener getAfterConnectInternalListener();
-   
+
    void setAfterConnectionInternalListener(AfterConnectInternalListener listener);
-   
+
    /** Used to better identify Cluster Connection Locators on logs. To facilitate eventual debugging.
-    * 
+    *
     *  This method used to be on tests interface, but I'm now making it part of the public interface since*/
    void setIdentity(String identity);
-   
-   String getIdentity();
 
    void setNodeID(String nodeID);
 
    String getNodeID();
-   
+
    void cleanup();
 
    ClientSessionFactoryInternal connect() throws  Exception;
@@ -57,7 +53,7 @@
    void notifyNodeUp(long uniqueEventID, String nodeID, Pair<TransportConfiguration, TransportConfiguration> connectorPair, boolean last);
 
    /**
-    * 
+    *
     * @param uniqueEventID 0 means get the previous ID +1
     * @param nodeID
     */
@@ -70,8 +66,4 @@
    TransportConfiguration getClusterTransportConfiguration();
 
    void setClusterTransportConfiguration(TransportConfiguration tc);
-
-   boolean isBackup();
-   
-   void setBackup(boolean backup);
 }

Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java	2012-03-13 12:04:45 UTC (rev 12294)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java	2012-03-13 12:05:00 UTC (rev 12295)
@@ -690,7 +690,6 @@
          serverLocator.setReconnectAttempts(0);
          serverLocator.setClusterConnection(true);
          serverLocator.setClusterTransportConfiguration(connector);
-         serverLocator.setBackup(server.getConfiguration().isBackup());
          serverLocator.setInitialConnectAttempts(-1);
          serverLocator.setClientFailureCheckPeriod(clientFailureCheckPeriod);
          serverLocator.setConnectionTTL(connectionTTL);