activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject activemq-artemis git commit: ARTEMIS-539 fixing tests
Date Fri, 03 Jun 2016 20:40:51 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master ac87304b1 -> cf3396a3a


ARTEMIS-539 fixing 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/cf3396a3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/cf3396a3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/cf3396a3

Branch: refs/heads/master
Commit: cf3396a3a605081dfb30b222a745bd803858fb70
Parents: ac87304
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Fri Jun 3 16:37:07 2016 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Fri Jun 3 16:37:21 2016 -0400

----------------------------------------------------------------------
 .../core/client/impl/ClientProducerCreditManagerImpl.java        | 4 ++++
 .../activemq/artemis/core/client/impl/ClientSessionImpl.java     | 1 +
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cf3396a3/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java
index 32ada4f..52fcdd4 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerCreditManagerImpl.java
@@ -79,6 +79,10 @@ public class ClientProducerCreditManagerImpl implements ClientProducerCreditMana
          // while this is still sending requests causing a dead lock
          if (needInit) {
             credits.init(context);
+
+            // Setting default address on the session
+            session.setAddress(null, address);
+
          }
 
          return credits;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cf3396a3/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index c973133..c29a76e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -1052,6 +1052,7 @@ public final class ClientSessionImpl implements ClientSessionInternal,
FailureLi
    @Override
    public void setAddress(final Message message, final SimpleString address) {
       if (defaultAddress == null) {
+         logger.tracef("setAddress() Setting default address as %s", address);
          defaultAddress = address;
 
          if (message != null) {


Mime
View raw message