You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2018/02/28 19:31:27 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1713 - Fix NPE inside
OpenWireConnection
Repository: activemq-artemis
Updated Branches:
refs/heads/master bbf0fb495 -> d61f058ff
ARTEMIS-1713 - Fix NPE inside OpenWireConnection
fix NPE inside getClientId() in OpenWireConnection
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d4041b5a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d4041b5a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d4041b5a
Branch: refs/heads/master
Commit: d4041b5a72edae68fd70c43ba9a53023b5ec567d
Parents: bbf0fb4
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Authored: Wed Feb 28 14:01:51 2018 -0500
Committer: Christopher L. Shannon (cshannon) <ch...@gmail.com>
Committed: Wed Feb 28 14:06:36 2018 -0500
----------------------------------------------------------------------
.../protocol/openwire/OpenWireConnection.java | 4 ++--
.../integration/plugin/OpenwirePluginTest.java | 20 ++++++++++++++++++--
2 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d4041b5a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index 99733ec..803ed22 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -193,7 +193,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
private final Set<SimpleString> knownDestinations = new ConcurrentHashSet<>();
- private AtomicBoolean disableTtl = new AtomicBoolean(false);
+ private final AtomicBoolean disableTtl = new AtomicBoolean(false);
public OpenWireConnection(Connection connection,
ActiveMQServer server,
@@ -1676,7 +1676,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
@Override
public String getClientID() {
- return context.getClientId();
+ return context != null ? context.getClientId() : null;
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d4041b5a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/OpenwirePluginTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/OpenwirePluginTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/OpenwirePluginTest.java
index fa7052d..d0206a7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/OpenwirePluginTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/plugin/OpenwirePluginTest.java
@@ -60,9 +60,12 @@ import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.plugin.ActiveMQServerPlugin;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.integration.openwire.BasicOpenWireTest;
import org.junit.Test;
@@ -76,6 +79,19 @@ public class OpenwirePluginTest extends BasicOpenWireTest {
long maxAddressSize, Map<String, AddressSettings> settings) {
ActiveMQServer server = super.createServer(realFiles, configuration, pageSize, maxAddressSize, settings);
server.registerBrokerPlugin(verifier);
+ server.registerBrokerPlugin(new ActiveMQServerPlugin() {
+
+ @Override
+ public void afterCreateConnection(RemotingConnection connection) throws ActiveMQException {
+ try {
+ //Verify that calling getClientID() before initialized doesn't cause an error
+ //Test for ARTEMIS-1713
+ connection.getClientID();
+ } catch (Exception e) {
+ throw new ActiveMQException(e.getMessage());
+ }
+ }
+ });
configuration.getAddressesSettings().put("autoCreated", new AddressSettings().setAutoDeleteAddresses(true)
.setAutoDeleteQueues(true).setAutoCreateQueues(true).setAutoCreateAddresses(true));
@@ -83,7 +99,7 @@ public class OpenwirePluginTest extends BasicOpenWireTest {
return server;
}
- @Test
+ @Test(timeout = 10000)
public void testAckedMessageAreConsumed() throws JMSException {
connection.start();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -119,7 +135,7 @@ public class OpenwirePluginTest extends BasicOpenWireTest {
}
- @Test
+ @Test(timeout = 10000)
public void testAutoCreatedQueue() throws JMSException {
connection.start();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
[2/2] activemq-artemis git commit: This closes #1910
Posted by ta...@apache.org.
This closes #1910
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d61f058f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d61f058f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d61f058f
Branch: refs/heads/master
Commit: d61f058ff28489ed4c4a88e133ed2249cdbdc898
Parents: bbf0fb4 d4041b5
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Feb 28 14:31:07 2018 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Feb 28 14:31:07 2018 -0500
----------------------------------------------------------------------
.../protocol/openwire/OpenWireConnection.java | 4 ++--
.../integration/plugin/OpenwirePluginTest.java | 20 ++++++++++++++++++--
2 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------