Merge branch 'stable'

michaelklishin · michaelklishin · commit b145f02e8f09 · 2015-09-18T15:55:40.000+03:00
diff --git a/src/com/rabbitmq/client/impl/AMQChannel.java b/src/com/rabbitmq/client/impl/AMQChannel.java
@@ -323,7 +323,7 @@ public void quiescingTransmit(AMQCommand c) throws IOException {
                 while (_blockContent) {
                     try {
                         _channelMutex.wait();
-                    } catch (InterruptedException e) {}
+                    } catch (InterruptedException ignored) {}
 
                     // This is to catch a situation when the thread wakes up during
                     // shutdown. Currently, no command that has content is allowed
diff --git a/src/com/rabbitmq/client/impl/AMQConnection.java b/src/com/rabbitmq/client/impl/AMQConnection.java
@@ -75,7 +75,7 @@ public class AMQConnection extends ShutdownNotifierComponent implements Connecti
      * @return a map of client properties
      * @see Connection#getClientProperties
      */
-    public static final Map<String, Object> defaultClientProperties() {
+    public static Map<String, Object> defaultClientProperties() {
         Map<String,Object> props = new HashMap<String, Object>();
         props.put("product", LongStringHelper.asLongString("RabbitMQ"));
         props.put("version", LongStringHelper.asLongString(ClientVersion.VERSION));
@@ -166,7 +166,7 @@ public final void disconnectChannel(ChannelN channel) {
             cm.releaseChannelNumber(channel);
     }
 
-    private final void ensureIsOpen()
+    private void ensureIsOpen()
         throws AlreadyClosedException
     {
         if (!isOpen()) {
@@ -287,7 +287,7 @@ public void start()
         mainLoopThread.start();
         // after this point clear-up of MainLoop is triggered by closing the frameHandler.
 
-        AMQP.Connection.Start connStart = null;
+        AMQP.Connection.Start connStart;
         AMQP.Connection.Tune connTune = null;
         try {
             connStart =
@@ -390,8 +390,6 @@ public void start()
 
         // We can now respond to errors having finished tailoring the connection
         this._inConnectionNegotiation = false;
-
-        return;
     }
 
     protected ChannelManager instantiateChannelManager(int channelMax, ThreadFactory threadFactory) {
@@ -408,7 +406,7 @@ protected int negotiateChannelMax(int requestedChannelMax, int serverMax) {
     /**
      * Private API - check required preconditions and protocol invariants
      */
-    private static final void checkPreconditions() {
+    private static void checkPreconditions() {
         AMQCommand.checkPreconditions();
     }
 
@@ -451,15 +449,17 @@ public void setHeartbeat(int heartbeat) {
      * Makes it possible to override thread factory that is used
      * to instantiate connection network I/O loop. Only necessary
      * in the environments with restricted
-     * @param threadFactory
+     * @param threadFactory thread factory to use
      */
+    @SuppressWarnings("unused")
     public void setThreadFactory(ThreadFactory threadFactory) {
         this.threadFactory = threadFactory;
     }
 
     /**
      * @return Thread factory used by this connection.
      */
+    @SuppressWarnings("unused")
     public ThreadFactory getThreadFactory() {
         return threadFactory;
     }
@@ -516,7 +516,7 @@ public void flush() throws IOException {
         _frameHandler.flush();
     }
 
-    private static final int negotiatedMaxValue(int clientValue, int serverValue) {
+    private static int negotiatedMaxValue(int clientValue, int serverValue) {
         return (clientValue == 0 || serverValue == 0) ?
             Math.max(clientValue, serverValue) :
             Math.min(clientValue, serverValue);
@@ -646,7 +646,7 @@ public boolean processControlCommand(Command c) throws IOException
                 // Already shutting down, so just send back a CloseOk.
                 try {
                     _channel0.quiescingTransmit(new AMQP.Connection.CloseOk.Builder().build());
-                } catch (IOException _e) { } // ignore
+                } catch (IOException ignored) { } // ignore
                 return true;
             } else if (method instanceof AMQP.Connection.CloseOk) {
                 // It's our final "RPC". Time to shut down.
@@ -666,7 +666,7 @@ public void handleConnectionClose(Command closeCommand) {
         ShutdownSignalException sse = shutdown(closeCommand.getMethod(), false, null, _inConnectionNegotiation);
         try {
             _channel0.quiescingTransmit(new AMQP.Connection.CloseOk.Builder().build());
-        } catch (IOException _e) { } // ignore
+        } catch (IOException ignored) { } // ignore
         _brokerInitiatedShutdown = true;
         SocketCloseWait scw = new SocketCloseWait(sse);
         final String name = "AMQP Connection Closing Monitor " +
@@ -793,7 +793,7 @@ public void abort(int closeCode, String closeMessage, int timeout)
     {
         try {
             close(closeCode, closeMessage, true, null, timeout, true);
-        } catch (IOException _e) { } // ignore
+        } catch (IOException ignored) { } // ignore
     }
 
     /**
