qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1694679 - /qpid/java/trunk/client/src/main/java/org/apache/qpid/client/FailoverHandler.java
Date Fri, 07 Aug 2015 13:03:26 GMT
Author: kwall
Date: Fri Aug  7 13:03:25 2015
New Revision: 1694679

URL: http://svn.apache.org/r1694679
Log:
QPID-6664: [Java Client] Remove dead redirection code from the 0-8..0-91 failover handler

Modified:
    qpid/java/trunk/client/src/main/java/org/apache/qpid/client/FailoverHandler.java

Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/FailoverHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/FailoverHandler.java?rev=1694679&r1=1694678&r2=1694679&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/FailoverHandler.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/FailoverHandler.java Fri Aug
 7 13:03:25 2015
@@ -42,19 +42,8 @@ public class FailoverHandler implements
     private static final Logger _logger = LoggerFactory.getLogger(FailoverHandler.class);
 
     /** Holds the protocol handler for the failed connection, upon which the new connection
is to be set up. */
-    private AMQProtocolHandler _amqProtocolHandler;
+    private final AMQProtocolHandler _amqProtocolHandler;
 
-    /** Used to hold the host to fail over to. This is optional and if not set a reconnect
to the previous host is tried. */
-    private String _host;
-
-    /** Used to hold the port to fail over to. */
-    private int _port;
-
-    /**
-     * Creates a failover handler on a protocol session, for a particular MINA session (network
connection).
-     *
-     * @param amqProtocolHandler The protocol handler that spans the failover.
-     */
     public FailoverHandler(AMQProtocolHandler amqProtocolHandler)
     {
         _amqProtocolHandler = amqProtocolHandler;
@@ -83,22 +72,14 @@ public class FailoverHandler implements
         _amqProtocolHandler.setStateManager(new AMQStateManager());
 
 
-        if (!connection.firePreFailover(_host != null))
+        if (!connection.firePreFailover(false))
         {
             _logger.info("Failover process veto-ed by client");
 
             //Restore Existing State Manager
             _amqProtocolHandler.setStateManager(existingStateManager);
 
-            AMQDisconnectedException cause;
-            if (_host != null)
-            {
-                cause = new AMQDisconnectedException("Redirect was vetoed by client", null);
-            }
-            else
-            {
-                cause = new AMQDisconnectedException("Failover was vetoed by client", null);
-            }
+            AMQDisconnectedException cause = new AMQDisconnectedException("Failover was vetoed
by client", null);
 
             connection.closed(cause);
 
@@ -110,19 +91,7 @@ public class FailoverHandler implements
 
         _logger.info("Starting failover process");
 
-        boolean failoverSucceeded;
-        // when host is non null we have a specified failover host otherwise we all the client
to cycle through
-        // all specified hosts
-
-        // if _host has value then we are performing a redirect.
-        if (_host != null)
-        {
-            failoverSucceeded = connection.attemptReconnection(_host, _port, true);
-        }
-        else
-        {
-            failoverSucceeded = connection.attemptReconnection();
-        }
+        boolean failoverSucceeded = connection.attemptReconnection();
 
         if (!failoverSucceeded)
         {
@@ -178,24 +147,4 @@ public class FailoverHandler implements
             }
         }
     }
-
-    /**
-     * Sets the host name to fail over to. This is optional and if not set a reconnect to
the previous host is tried.
-     *
-     * @param host The host name to fail over to.
-     */
-    public void setHost(String host)
-    {
-        _host = host;
-    }
-
-    /**
-     * Sets the port to fail over to.
-     *
-     * @param port The port to fail over to.
-     */
-    public void setPort(int port)
-    {
-        _port = port;
-    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message