This closes #616

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java

@@ -787,7 +787,6 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
             }
             catch (ActiveMQException e) {
                factory.close();
-               factory = null;
                if (e.getType() == ActiveMQExceptionType.NOT_CONNECTED) {
                   attempts++;
 
@@ -813,9 +812,7 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
       // how the sendSubscription happens.
       // in case this ever changes.
       if (topology != null && !factory.waitForTopology(callTimeout, TimeUnit.MILLISECONDS)) {
-         if (factory != null) {
+         factory.cleanup();
-            factory.cleanup();
-         }
          throw ActiveMQClientMessageBundle.BUNDLE.connectionTimedOutOnReceiveTopology(discoveryGroup);
       }
 
@@ -1647,21 +1644,19 @@ public final class ServerLocatorImpl implements ServerLocatorInternal, Discovery
 
          initialise();
 
-         ClientSessionFactory csf = null;
-
          createConnectors();
 
          try {
 
             int retryNumber = 0;
-            while (csf == null && !isClosed()) {
+            while (!isClosed()) {
                retryNumber++;
                for (Connector conn : connectors) {
                   if (logger.isDebugEnabled()) {
                      logger.debug(this + "::Submitting connect towards " + conn);
                   }
 
-                  csf = conn.tryConnect();
+                  ClientSessionFactory csf = conn.tryConnect();
 
                   if (csf != null) {
                      csf.getConnection().addFailureListener(new FailureListener() {

artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/json/JSONObject.java

@@ -363,13 +363,7 @@ public class JSONObject {
                }
             }
          }
-         catch (IllegalAccessException e) {
+         catch (IllegalAccessException | InvocationTargetException | JSONException e) {
-            throw new RuntimeException(e);
-         }
-         catch (JSONException e) {
-            throw new RuntimeException(e);
-         }
-         catch (InvocationTargetException e) {
             throw new RuntimeException(e);
          }
       }

artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java

@@ -102,9 +102,7 @@ public class XmlUtil {
 
       XMLStreamReader reader = factory.createXMLStreamReader(new FileInputStream(configuration));
 
-      if (props != null) {
+      reader = new PropertiesFilter(reader, props);
-         reader = new PropertiesFilter(reader, props);
-      }
 
       return clazz.cast(unmarshaller.unmarshal(reader));
    }

artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java

@@ -176,9 +176,6 @@ public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeCont
       if (mode != null) {
          bridge.setQualityOfServiceMode(QualityOfServiceMode.valueOf(mode));
       }
-      else {
-         mode = null;
-      }
    }
 
    @Override

artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java

@@ -1523,8 +1523,7 @@ public final class JMSBridgeImpl implements JMSBridge {
 
          targetProducer.send(targetDestination, msg, msg.getJMSDeliveryMode(), msg.getJMSPriority(), timeToLive);
 
-         if (msg != null)
+         messageCount++;
-            messageCount++;
          if (JMSBridgeImpl.trace) {
             ActiveMQJMSBridgeLogger.LOGGER.trace("Sent message " + msg);
          }

artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java

@@ -891,10 +891,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
             ActiveMQDestination.decomposeQueueNameForDurableSubscription(consumer.getQueue().getName().toString());
             obj.put("durable", true);
          }
-         catch (IllegalArgumentException e) {
+         catch (IllegalArgumentException | JMSRuntimeException e) {
-            obj.put("durable", false);
-         }
-         catch (JMSRuntimeException e) {
             obj.put("durable", false);
          }
       }

artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/message/JMSMappingOutboundTransformer.java

@@ -148,16 +148,11 @@ public class JMSMappingOutboundTransformer extends OutboundTransformer {
 
          String msgId = msg.getJMSMessageID();
 
-         if (msgId != null) {
+         try {
-            try {
+            props.setMessageId(AMQPMessageIdHelper.INSTANCE.toIdObject(msgId));
-               props.setMessageId(AMQPMessageIdHelper.INSTANCE.toIdObject(msgId));
-            }
-            catch (ActiveMQAMQPIllegalStateException e) {
-               props.setMessageId(msgId);
-            }
          }
-         else {
+         catch (ActiveMQAMQPIllegalStateException e) {
-            props.setMessageId(msgId.toString());
+            props.setMessageId(msgId);
          }
       }
       if (msg.getJMSDestination() != null) {

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java

@@ -956,10 +956,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
                scheduleRetryConnect();
             }
          }
-         catch (ActiveMQInterruptedException e) {
+         catch (ActiveMQInterruptedException | InterruptedException e) {
-            ActiveMQServerLogger.LOGGER.errorConnectingBridge(e, this);
-         }
-         catch (InterruptedException e) {
             ActiveMQServerLogger.LOGGER.errorConnectingBridge(e, this);
          }
          catch (Exception e) {
@@ -1138,10 +1135,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
             }
             ActiveMQServerLogger.LOGGER.bridgeStopped(name);
          }
-         catch (RuntimeException e) {
+         catch (InterruptedException | RuntimeException e) {
-            ActiveMQServerLogger.LOGGER.error("Failed to stop bridge", e);
-         }
-         catch (InterruptedException e) {
             ActiveMQServerLogger.LOGGER.error("Failed to stop bridge", e);
          }
       }

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java

@@ -120,11 +120,8 @@ public final class SharedStoreBackupActivation extends Activation {
             startFailbackChecker();
          }
       }
-      catch (InterruptedException e) {
+      catch (ClosedChannelException | InterruptedException e) {
-         // this is ok, we are being stopped
+         // these are ok, we are being stopped
-      }
-      catch (ClosedChannelException e) {
-         // this is ok too, we are being stopped
       }
       catch (Exception e) {
          if (!(e.getCause() instanceof InterruptedException)) {

artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/GuestLoginModule.java

@@ -90,9 +90,7 @@ public class GuestLoginModule implements LoginModule {
                passwordCallback.clearPassword();
             }
          }
-         catch (IOException ioe) {
+         catch (IOException | UnsupportedCallbackException e) {
-         }
-         catch (UnsupportedCallbackException uce) {
          }
       }
       if (debug) {

artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java

@@ -102,11 +102,8 @@ public class LDAPLoginModule implements LoginModule {
       try {
          handler.handle(callbacks);
       }
-      catch (IOException ioe) {
+      catch (IOException | UnsupportedCallbackException e) {
-         throw (LoginException) new LoginException().initCause(ioe);
+         throw (LoginException) new LoginException().initCause(e);
-      }
-      catch (UnsupportedCallbackException uce) {
-         throw (LoginException) new LoginException().initCause(uce);
       }
 
       String password;

examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/SecurityExample.java

@@ -64,7 +64,6 @@ public class SecurityExample {
          }
 
          // Step 5. bill tries to make a connection using wrong password
-         billConnection = null;
          try {
             billConnection = createConnection("bill", "activemq1", cf);
             result = false;

tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java

@@ -20,7 +20,6 @@ import java.net.URI;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;