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

Remove unnecessary null checks and assignments

This commit is contained in:
Ville Skyttä 2016-07-02 00:31:06 +03:00 committed by Clebert Suconic
parent c4ab15060a
commit 149216e8ec
6 changed files with 9 additions and 26 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() {

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

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

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;