Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #616

This commit is contained in:
Clebert Suconic 2016-07-05 14:18:02 -04:00
parent c4ab15060a 358aff4892
commit 84959d0300
13 changed files with 18 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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() {

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

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

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

@ -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));
}

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

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

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

@ -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);
}

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

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

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

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

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

@ -956,10 +956,7 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
scheduleRetryConnect();
}
}
catch (ActiveMQInterruptedException e) {
ActiveMQServerLogger.LOGGER.errorConnectingBridge(e, this);
}
catch (InterruptedException e) {
catch (ActiveMQInterruptedException | 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) {
ActiveMQServerLogger.LOGGER.error("Failed to stop bridge", e);
}
catch (InterruptedException e) {
catch (InterruptedException | RuntimeException e) {
ActiveMQServerLogger.LOGGER.error("Failed to stop bridge", e);
}
}

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

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

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

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

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

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

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

@ -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;

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

@ -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;