You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/07/28 21:27:16 UTC
[09/11] activemq-artemis git commit: Fix some potential NPEs in
examples and tests
Fix some potential NPEs in examples and tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/04eed1b7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/04eed1b7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/04eed1b7
Branch: refs/heads/master
Commit: 04eed1b7f4c5551746c883aa640ef5279ba9f30e
Parents: 6122223
Author: Ville Skytt� <vi...@iki.fi>
Authored: Thu Jul 28 22:50:55 2016 +0300
Committer: Ville Skytt� <vi...@iki.fi>
Committed: Thu Jul 28 23:30:02 2016 +0300
----------------------------------------------------------------------
.../ldap/InMemoryDirectoryServiceFactory.java | 2 +-
.../extras/jms/xa/JMSXDeliveryCountTest.java | 6 ++---
.../integration/client/JournalCrashTest.java | 23 ++++----------------
.../integration/stomp/v11/StompV11Test.java | 5 +++--
.../integration/stomp/v12/StompV12Test.java | 5 +++--
5 files changed, 13 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/04eed1b7/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemoryDirectoryServiceFactory.java
----------------------------------------------------------------------
diff --git a/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemoryDirectoryServiceFactory.java b/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemoryDirectoryServiceFactory.java
index ce48693..d7ebde4 100644
--- a/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemoryDirectoryServiceFactory.java
+++ b/examples/features/standard/security-ldap/src/main/java/org/apache/activemq/artemis/jms/example/ldap/InMemoryDirectoryServiceFactory.java
@@ -89,7 +89,7 @@ public class InMemoryDirectoryServiceFactory implements DirectoryServiceFactory
*/
@Override
public void init(String name) throws Exception {
- if ((directoryService != null) && directoryService.isStarted()) {
+ if ((directoryService == null) || directoryService.isStarted()) {
return;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/04eed1b7/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
index 1d71598..3c1c0b5 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
@@ -671,12 +671,10 @@ public class JMSXDeliveryCountTest extends JMSTestBase {
if (tm == null) {
failed = true;
}
-
- if (!tm.getText().equals("testing" + i)) {
+ else if (!tm.getText().equals("testing" + i)) {
failed = true;
}
-
- if (tm.getIntProperty("JMSXDeliveryCount") != j + 1) {
+ else if (tm.getIntProperty("JMSXDeliveryCount") != j + 1) {
failed = true;
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/04eed1b7/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java
index 774fb1b..e340d38 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JournalCrashTest.java
@@ -108,10 +108,7 @@ public class JournalCrashTest extends ActiveMQTestBase {
}
public void sendMessages(final int start, final int end) throws Exception {
- ClientSession session = null;
- try {
-
- session = factory.createSession(false, false);
+ try (ClientSession session = factory.createSession(false, false)) {
try {
session.createQueue(QUEUE, QUEUE, true);
@@ -132,9 +129,6 @@ public class JournalCrashTest extends ActiveMQTestBase {
session.close();
// server.stop(); -- this test was not supposed to stop the server, it should crash
}
- finally {
- session.close();
- }
}
@Test
@@ -146,11 +140,10 @@ public class JournalCrashTest extends ActiveMQTestBase {
printJournal();
- ClientSession session = null;
- try {
- startServer();
+ startServer();
+
+ try (ClientSession session = factory.createSession(true, true)) {
- session = factory.createSession(true, true);
ClientConsumer consumer = session.createConsumer(QUEUE);
session.start();
@@ -165,14 +158,6 @@ public class JournalCrashTest extends ActiveMQTestBase {
}
session.close();
}
- finally {
- try {
- session.close();
- }
- catch (Throwable ignored) {
- }
- }
-
}
/**
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/04eed1b7/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
index b3d1461..f539cd6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
@@ -64,8 +64,9 @@ public class StompV11Test extends StompV11TestBase {
@After
public void tearDown() throws Exception {
try {
- log.debug("Connection 11 : " + connV11.isConnected());
- if (connV11 != null && connV11.isConnected()) {
+ boolean connected = connV11 != null && connV11.isConnected();
+ log.debug("Connection 11 : " + connected);
+ if (connected) {
connV11.disconnect();
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/04eed1b7/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
index 3b9c991..adebae6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
@@ -67,8 +67,9 @@ public class StompV12Test extends StompV11TestBase {
@After
public void tearDown() throws Exception {
try {
- log.debug("Connection 1.2 : " + connV12.isConnected());
- if (connV12 != null && connV12.isConnected()) {
+ boolean connected = connV12 != null && connV12.isConnected();
+ log.debug("Connection 1.2 : " + connected);
+ if (connected) {
connV12.disconnect();
}
}