This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push: new 3473618 NO-JIRA fixing another test 3473618 is described below commit 3473618a06891369a548861b1a34b4f94d0ecfee Author: Clebert Suconic <clebertsuco...@apache.org> AuthorDate: Tue Mar 12 20:21:03 2019 -0400 NO-JIRA fixing another test test failing: org.apache.activemq.artemis.tests.integration.management.AddressControlTest.testSendMessage --- .../activemq/artemis/core/management/impl/AddressControlImpl.java | 1 + .../apache/activemq/artemis/core/server/impl/ServerSessionImpl.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java index 4a81555..f3ba28b 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java @@ -307,6 +307,7 @@ public class AddressControlImpl extends AbstractControl implements AddressContro try { return sendMessage(addressInfo.getName(), server, headers, type, body, durable, user, password); } catch (Exception e) { + e.printStackTrace(); throw new IllegalStateException(e.getMessage()); } } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java index 04322df..a5cb20a 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java @@ -435,7 +435,9 @@ public class ServerSessionImpl implements ServerSession, FailureListener { private void sendSessionNotification(final CoreNotificationType type) throws Exception { final TypedProperties props = new TypedProperties(); - props.putSimpleStringProperty(ManagementHelper.HDR_CONNECTION_NAME, SimpleString.toSimpleString(this.getConnectionID().toString())); + if (this.getConnectionID() != null) { + props.putSimpleStringProperty(ManagementHelper.HDR_CONNECTION_NAME, SimpleString.toSimpleString(this.getConnectionID().toString())); + } props.putSimpleStringProperty(ManagementHelper.HDR_USER, SimpleString.toSimpleString(this.getUsername())); props.putSimpleStringProperty(ManagementHelper.HDR_SESSION_NAME, SimpleString.toSimpleString(this.getName()));