Jenkins build is back to stable : ActiveMQ-Java8-5.15.x » ActiveMQ :: LevelDB Store #85

[Apache Jenkins Server]

See 

Jenkins build is still unstable: ActiveMQ-Java8-5.15.x » ActiveMQ :: Unit Tests #85

[Apache Jenkins Server]

See 

Jenkins build is still unstable: ActiveMQ-Java8-5.15.x #85

[Apache Jenkins Server]

See 

Jenkins build is still unstable: ActiveMQ-Java8-5.15.x » ActiveMQ :: Karaf Integration Tests #85

[Apache Jenkins Server]

See 

Jenkins build is back to normal : ActiveMQ-Artemis-Master #1511

[Apache Jenkins Server]

See 

[1/2] activemq-artemis git commit: Revert "ARTEMIS-1545 Support JMS 2.0 Completion Listener for Exceptions" Revert "ARTEMIS-1545 Adding HornetQ 2.4.7 on the mesh to validate send-acks"

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 386f09037 -> 7514e91ed


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7514e91e/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
index 15f4e42..e93dd94 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
@@ -40,7 +40,6 @@ import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateQueu
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateQueueMessage_V2;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSharedQueueMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSharedQueueMessage_V2;
-import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ExceptionResponseMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.NullResponseMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.RollbackMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage;
@@ -64,7 +63,6 @@ import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionQue
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage_V3;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendContinuationMessage;
-import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendContinuationMessage_V2;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendLargeMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage;
@@ -82,7 +80,6 @@ import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAR
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAStartMessage;
-import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SuccessResponseMessage;
 import org.apache.activemq.artemis.core.remoting.CloseListener;
 import org.apache.activemq.artemis.core.remoting.FailureListener;
 import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection;
@@ -122,9 +119,7 @@ import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SES
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_ROLLBACK;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION;
-import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION_V2;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE;
-import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND_V2;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_START;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_STOP;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_COMMIT;
@@ -269,10 +264,6 @@ public class ServerSessionPacketHandler implements 
ChannelHandler {
 onSessionSend(packet);
 break;
  }
- case SESS_SEND_V2: {
-onSessionSend(packet);
-break;
- }
  case SESS_ACKNOWLEDGE: {
 onSessionAcknowledge(packet);
 break;
@@ -320,15 +311,6 @@ public class ServerSessionPacketHandler implements 
ChannelHandler {
   }
   break;
}
-   case SESS_SEND_CONTINUATION_V2: {
-  SessionSendContinuationMessage_V2 message = 
(SessionSendContinuationMessage_V2) packet;
-  requiresResponse = message.isRequiresResponse();
-  sendContinuations(message.getPacketSize(), 
message.getMessageBodySize(), message.getBody(), message.isContinues());
-  if (req

[2/2] activemq-artemis git commit: Revert "ARTEMIS-1545 Support JMS 2.0 Completion Listener for Exceptions" Revert "ARTEMIS-1545 Adding HornetQ 2.4.7 on the mesh to validate send-acks"

[clebertsuconic]

Revert "ARTEMIS-1545 Support JMS 2.0 Completion Listener for Exceptions"
Revert "ARTEMIS-1545 Adding HornetQ 2.4.7 on the mesh to validate send-acks"

I'm reverting this as the testsuite is broken..
We will send it back once worked out.

This reverts commit 8f5b7a1e73164f7b7867872a77d74f13176a5af5.
This reverts commit 9b982b3e303067cec8cac277a19a3ab3c63a1a9f.


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7514e91e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7514e91e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7514e91e

Branch: refs/heads/master
Commit: 7514e91ed1af3b0586903426c8532728ef3e0912
Parents: 386f090
Author: Clebert Suconic 
Authored: Tue Dec 19 17:01:56 2017 -0500
Committer: Clebert Suconic 
Committed: Tue Dec 19 17:03:00 2017 -0500

--
 .../core/client/SendAcknowledgementHandler.java |   7 --
 .../client/ActiveMQClientMessageBundle.java |   3 -
 .../artemis/core/protocol/core/Channel.java |   3 -
 .../protocol/core/CoreRemotingConnection.java   |   5 -
 .../artemis/core/protocol/core/Packet.java  |   8 --
 .../core/protocol/core/ResponseHandler.java |  30 -
 .../core/impl/ActiveMQSessionContext.java   |  89 --
 .../core/protocol/core/impl/ChannelImpl.java|  64 +-
 .../core/protocol/core/impl/PacketDecoder.java  |  26 +---
 .../core/protocol/core/impl/PacketImpl.java |  33 -
 .../core/protocol/core/impl/ResponseCache.java  |  61 --
 .../impl/wireformat/CreateAddressMessage.java   |   1 -
 .../impl/wireformat/CreateQueueMessage.java |   1 -
 .../wireformat/CreateSharedQueueMessage.java|   1 -
 .../wireformat/ExceptionResponseMessage.java| 120 ---
 .../wireformat/SessionAcknowledgeMessage.java   |   1 -
 .../SessionCreateConsumerMessage.java   |   1 -
 .../SessionIndividualAcknowledgeMessage.java|   1 -
 .../SessionSendContinuationMessage.java |  31 +
 .../SessionSendContinuationMessage_V2.java  | 120 ---
 .../impl/wireformat/SessionSendMessage.java |  20 +---
 .../impl/wireformat/SessionSendMessage_V2.java  | 113 -
 .../impl/wireformat/SuccessResponseMessage.java |  93 --
 .../main/resources/activemq-version.properties  |   2 +-
 .../jms/client/ActiveMQMessageProducer.java |  30 -
 .../core/protocol/ServerPacketDecoder.java  |  10 --
 .../core/ServerSessionPacketHandler.java|  94 +--
 pom.xml |   2 +-
 .../tests/compatibility/SendAckTest.java|   2 -
 .../cluster/util/BackupSyncDelay.java   |   6 -
 .../artemis/jms/tests/SecurityTest.java |  82 +
 tests/jms-tests/src/test/resources/broker.xml   |  10 --
 32 files changed, 64 insertions(+), 1006 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7514e91e/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
index 0f47536..c164f6c 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
@@ -41,11 +41,4 @@ public interface SendAcknowledgementHandler {
 * @param message message sent asynchronously
 */
void sendAcknowledged(Message message);
-
-   default void sendFailed(Message message, Exception e) {
-  //This is to keep old behaviour that would ack even if error,
-  // if anyone custom implemented this interface but doesnt update.
-  sendAcknowledged(message);
-   }
-
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7514e91e/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
index ac8be9b..64107b9 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
@@ -234,7 +234,4 @@ pu

Build failed in Jenkins: ActiveMQ-Artemis-Master #1510

[Apache Jenkins Server]

See 


Changes:

[clebertsuconic] ARTEMIS-1545 Support JMS 2.0 Completion Listener for Exceptions

[clebertsuconic] ARTEMIS-1545 Adding HornetQ 2.4.7 on the mesh to validate 
send-acks

--
Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on H30 (ubuntu xenial) in workspace 

Cloning the remote Git repository
Cloning repository https://git-wip-us.apache.org/repos/asf/activemq-artemis.git
 > git init  # 
 > timeout=10
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/activemq-artemis.git
 > git --version # timeout=10
 > git fetch --tags --progress 
 > https://git-wip-us.apache.org/repos/asf/activemq-artemis.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/activemq-artemis.git # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # 
 > timeout=10
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/activemq-artemis.git # timeout=10
Cleaning workspace
 > git rev-parse --verify HEAD # timeout=10
No valid HEAD. Skipping the resetting
 > git clean -fdx # timeout=10
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/activemq-artemis.git
 > git fetch --tags --progress 
 > https://git-wip-us.apache.org/repos/asf/activemq-artemis.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git rev-parse origin/master^{commit} # timeout=10
Checking out Revision 386f0903723b7f6462dcf475e578f3c09e3d2273 (origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 386f0903723b7f6462dcf475e578f3c09e3d2273
Commit message: "This closes #1722"
 > git rev-list fb34214a1af6bcfe0a6e871e125b2a38cc416a90 # timeout=10
java.util.concurrent.TimeoutException: Timeout waiting for task.
at 
com.google.common.util.concurrent.AbstractFuture$Sync.get(AbstractFuture.java:259)
at 
com.google.common.util.concurrent.AbstractFuture.get(AbstractFuture.java:91)
at 
com.google.common.util.concurrent.ForwardingFuture.get(ForwardingFuture.java:69)
at 
com.atlassian.jira.rest.client.internal.async.DelegatingPromise.get(DelegatingPromise.java:107)
at 
hudson.plugins.jira.JiraRestService.getIssuesFromJqlSearch(JiraRestService.java:177)
at 
hudson.plugins.jira.JiraSession.getIssuesFromJqlSearch(JiraSession.java:135)
at 
io.jenkins.blueocean.service.embedded.jira.JiraSCMListener.onChangeLogParsed(JiraSCMListener.java:43)
at 
hudson.model.listeners.SCMListener.onChangeLogParsed(SCMListener.java:120)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:582)
Caused: java.io.IOException: Failed to parse changelog
at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:584)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:491)
at hudson.model.Run.execute(Run.java:1737)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
at hudson.model.ResourceController.execute(ResourceController.java:97)
at hudson.model.Executor.run(Executor.java:419)
Retrying after 10 seconds
 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/activemq-artemis.git # timeout=10
Cleaning workspace
 > git rev-parse --verify HEAD # timeout=10
Resetting working tree
 > git reset --hard # timeout=10
 > git clean -fdx # timeout=10
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/activemq-artemis.git
 > git --version # timeout=10
 > git fetch --tags --progress 
 > https://git-wip-us.apache.org/repos/asf/activemq-artemis.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git rev-parse origin/master^{commit} # timeout=10
Checking out Revision 386f0903723b7f6462dcf475e578f3c09e3d2273 (origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 386f0903723b7f6462dcf475e578f3c09e3d2273
Commit message: "This closes #1722"
java.util.concurrent.TimeoutException: Timeout waiting for task.
at 
com.google.common.util.concurrent.AbstractFuture$Sync.get(AbstractFuture.java:259)
at 
com.google.common.util.concurrent.AbstractFuture.get(AbstractFuture.java:91)
at 
com.google.common.util.concurrent.ForwardingFuture.get(ForwardingFuture.java:69)
at 
com.atlassian.jira.rest.client.internal.async.DelegatingPromise.get(DelegatingPromise.java:107)
at 
hudson.plugins.jira.JiraRestService.getIssuesFromJqlSearch(JiraRestService.java:177)
at 
hudson.plu

[4/4] activemq-artemis git commit: This closes #1722

[clebertsuconic]

This closes #1722


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/386f0903
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/386f0903
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/386f0903

Branch: refs/heads/master
Commit: 386f0903723b7f6462dcf475e578f3c09e3d2273
Parents: fb34214 8f5b7a1
Author: Clebert Suconic 
Authored: Tue Dec 19 15:05:15 2017 -0500
Committer: Clebert Suconic 
Committed: Tue Dec 19 15:05:15 2017 -0500

--
 .../core/client/SendAcknowledgementHandler.java |   7 ++
 .../client/ActiveMQClientMessageBundle.java |   3 +
 .../artemis/core/protocol/core/Channel.java |   3 +
 .../protocol/core/CoreRemotingConnection.java   |   5 +
 .../artemis/core/protocol/core/Packet.java  |   8 ++
 .../core/protocol/core/ResponseHandler.java |  30 +
 .../core/impl/ActiveMQSessionContext.java   |  89 ++
 .../core/protocol/core/impl/ChannelImpl.java|  64 +-
 .../core/protocol/core/impl/PacketDecoder.java  |  26 +++-
 .../core/protocol/core/impl/PacketImpl.java |  33 +
 .../core/protocol/core/impl/ResponseCache.java  |  61 ++
 .../impl/wireformat/CreateAddressMessage.java   |   1 +
 .../impl/wireformat/CreateQueueMessage.java |   1 +
 .../wireformat/CreateSharedQueueMessage.java|   1 +
 .../wireformat/ExceptionResponseMessage.java| 120 +++
 .../wireformat/SessionAcknowledgeMessage.java   |   1 +
 .../SessionCreateConsumerMessage.java   |   1 +
 .../SessionIndividualAcknowledgeMessage.java|   1 +
 .../SessionSendContinuationMessage.java |  31 -
 .../SessionSendContinuationMessage_V2.java  | 120 +++
 .../impl/wireformat/SessionSendMessage.java |  20 +++-
 .../impl/wireformat/SessionSendMessage_V2.java  | 113 +
 .../impl/wireformat/SuccessResponseMessage.java |  93 ++
 .../main/resources/activemq-version.properties  |   2 +-
 .../jms/client/ActiveMQMessageProducer.java |  30 +
 .../core/protocol/ServerPacketDecoder.java  |  10 ++
 .../core/ServerSessionPacketHandler.java|  94 ++-
 pom.xml |   2 +-
 .../tests/compatibility/SendAckTest.java|   2 +
 .../cluster/util/BackupSyncDelay.java   |   6 +
 .../artemis/jms/tests/SecurityTest.java |  82 -
 tests/jms-tests/src/test/resources/broker.xml   |  10 ++
 32 files changed, 1006 insertions(+), 64 deletions(-)
--

[1/4] activemq-artemis git commit: ARTEMIS-1545 Support JMS 2.0 Completion Listener for Exceptions

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master fb34214a1 -> 386f09037


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9b982b3e/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
index e93dd94..15f4e42 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
@@ -40,6 +40,7 @@ import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateQueu
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateQueueMessage_V2;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSharedQueueMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSharedQueueMessage_V2;
+import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ExceptionResponseMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.NullResponseMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.RollbackMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage;
@@ -63,6 +64,7 @@ import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionQue
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionQueueQueryResponseMessage_V3;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionRequestProducerCreditsMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendContinuationMessage;
+import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendContinuationMessage_V2;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendLargeMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionUniqueAddMetaDataMessage;
@@ -80,6 +82,7 @@ import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAR
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXASetTimeoutMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXASetTimeoutResponseMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXAStartMessage;
+import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SuccessResponseMessage;
 import org.apache.activemq.artemis.core.remoting.CloseListener;
 import org.apache.activemq.artemis.core.remoting.FailureListener;
 import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection;
@@ -119,7 +122,9 @@ import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SES
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_ROLLBACK;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION;
+import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND_CONTINUATION_V2;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND_LARGE;
+import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_SEND_V2;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_START;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_STOP;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_XA_COMMIT;
@@ -264,6 +269,10 @@ public class ServerSessionPacketHandler implements 
ChannelHandler {
 onSessionSend(packet);
 break;
  }
+ case SESS_SEND_V2: {
+onSessionSend(packet);
+break;
+ }
  case SESS_ACKNOWLEDGE: {
 onSessionAcknowledge(packet);
 break;
@@ -311,6 +320,15 @@ public class ServerSessionPacketHandler implements 
ChannelHandler {
   }
   break;
}
+   case SESS_SEND_CONTINUATION_V2: {
+  SessionSendContinuationMessage_V2 message = 
(SessionSendContinuationMessage_V2) packet;
+  requiresResponse = message.isRequiresResponse();
+  sendContinuations(message.getPacketSize(), 
message.getMessageBodySize(), message.getBody(), message.isContinues());
+  if (req

[2/4] activemq-artemis git commit: ARTEMIS-1545 Support JMS 2.0 Completion Listener for Exceptions

[clebertsuconic]

ARTEMIS-1545 Support JMS 2.0 Completion Listener for Exceptions



Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9b982b3e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9b982b3e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9b982b3e

Branch: refs/heads/master
Commit: 9b982b3e303067cec8cac277a19a3ab3c63a1a9f
Parents: fb34214
Author: Michael André Pearce 
Authored: Thu Dec 14 07:47:30 2017 +
Committer: Clebert Suconic 
Committed: Tue Dec 19 14:44:58 2017 -0500

--
 .../core/client/SendAcknowledgementHandler.java |   7 ++
 .../client/ActiveMQClientMessageBundle.java |   3 +
 .../artemis/core/protocol/core/Channel.java |   3 +
 .../protocol/core/CoreRemotingConnection.java   |   5 +
 .../artemis/core/protocol/core/Packet.java  |   8 ++
 .../core/protocol/core/ResponseHandler.java |  30 +
 .../core/impl/ActiveMQSessionContext.java   |  89 ++
 .../core/protocol/core/impl/ChannelImpl.java|  64 +-
 .../core/protocol/core/impl/PacketDecoder.java  |  26 +++-
 .../core/protocol/core/impl/PacketImpl.java |  30 +
 .../core/protocol/core/impl/ResponseCache.java  |  61 ++
 .../impl/wireformat/CreateAddressMessage.java   |   1 +
 .../impl/wireformat/CreateQueueMessage.java |   1 +
 .../wireformat/CreateSharedQueueMessage.java|   1 +
 .../wireformat/ExceptionResponseMessage.java| 120 +++
 .../wireformat/SessionAcknowledgeMessage.java   |   1 +
 .../SessionCreateConsumerMessage.java   |   1 +
 .../SessionIndividualAcknowledgeMessage.java|   1 +
 .../SessionSendContinuationMessage.java |  31 -
 .../SessionSendContinuationMessage_V2.java  | 120 +++
 .../impl/wireformat/SessionSendMessage.java |  20 +++-
 .../impl/wireformat/SessionSendMessage_V2.java  | 113 +
 .../impl/wireformat/SuccessResponseMessage.java |  93 ++
 .../main/resources/activemq-version.properties  |   2 +-
 .../jms/client/ActiveMQMessageProducer.java |  30 +
 .../core/protocol/ServerPacketDecoder.java  |  10 ++
 .../core/ServerSessionPacketHandler.java|  94 ++-
 pom.xml |   2 +-
 .../cluster/util/BackupSyncDelay.java   |   6 +
 .../artemis/jms/tests/SecurityTest.java |  82 -
 tests/jms-tests/src/test/resources/broker.xml   |  10 ++
 31 files changed, 1001 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9b982b3e/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
index c164f6c..0f47536 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/SendAcknowledgementHandler.java
@@ -41,4 +41,11 @@ public interface SendAcknowledgementHandler {
 * @param message message sent asynchronously
 */
void sendAcknowledged(Message message);
+
+   default void sendFailed(Message message, Exception e) {
+  //This is to keep old behaviour that would ack even if error,
+  // if anyone custom implemented this interface but doesnt update.
+  sendAcknowledged(message);
+   }
+
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9b982b3e/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
index 64107b9..ac8be9b 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
@@ -234,4 +234,7 @@ public interface ActiveMQClientMessageBundle {
 
@Message(id = 119062, value = "Multi-packet transmission (e.g. Large 
Messages) interrupted because of a reconnection.")
ActiveMQInterruptedException packetTransmissionInterrupted();
+
+   @Message(id = 119063, value = "Cannot send a packet while response cache is 
full.")
+   IllegalStateExc

[3/4] activemq-artemis git commit: ARTEMIS-1545 Adding HornetQ 2.4.7 on the mesh to validate send-acks

[clebertsuconic]

ARTEMIS-1545 Adding HornetQ 2.4.7 on the mesh to validate send-acks


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/8f5b7a1e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/8f5b7a1e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/8f5b7a1e

Branch: refs/heads/master
Commit: 8f5b7a1e73164f7b7867872a77d74f13176a5af5
Parents: 9b982b3
Author: Clebert Suconic 
Authored: Tue Dec 19 14:44:52 2017 -0500
Committer: Clebert Suconic 
Committed: Tue Dec 19 15:03:04 2017 -0500

--
 .../activemq/artemis/core/protocol/core/impl/PacketImpl.java  | 3 +++
 .../apache/activemq/artemis/tests/compatibility/SendAckTest.java  | 2 ++
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8f5b7a1e/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
index 00e9613..48f6c6c 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
@@ -29,7 +29,10 @@ public class PacketImpl implements Packet {
// Constants 
-
 
 
+   // 2.0.0
public static final int ADDRESSING_CHANGE_VERSION = 129;
+
+   // 2.5.0
public static final int ASYNC_RESPONSE_CHANGE_VERSION = 130;
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8f5b7a1e/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
--
diff --git 
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
 
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
index 2f21704..6b68304 100644
--- 
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
+++ 
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
@@ -21,6 +21,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import static 
org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_247;
 import static 
org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
 import static 
org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
 import static 
org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR;
@@ -61,6 +62,7 @@ public class SendAckTest extends VersionedBaseTest {
   // not every combination on two four would make sense.. as there's a 
compatibility issue between 2.4 and 1.4 when crossing consumers and producers
   combinations.add(new Object[]{TWO_FOUR, SNAPSHOT, SNAPSHOT});
   combinations.add(new Object[]{SNAPSHOT, TWO_FOUR, TWO_FOUR});
+  combinations.add(new Object[]{HORNETQ_247, SNAPSHOT, SNAPSHOT});
   return combinations;
}
 

Jenkins build is unstable: ActiveMQ-Java8-All-UnitTests #777

[Apache Jenkins Server]

See 

[1/2] activemq-artemis git commit: ARTEMIS-1546 speed up mesh test

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master a3d297ff9 -> fb34214a1


ARTEMIS-1546 speed up mesh test


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2197d377
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2197d377
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2197d377

Branch: refs/heads/master
Commit: 2197d377c91bffd652db784829eb28c0c106611f
Parents: a3d297f
Author: Clebert Suconic 
Authored: Tue Dec 19 10:20:30 2017 -0500
Committer: Clebert Suconic 
Committed: Tue Dec 19 10:20:38 2017 -0500

--
 .../tests/compatibility/VersionedBaseTest.java  | 23 +++-
 1 file changed, 22 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2197d377/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/VersionedBaseTest.java
--
diff --git 
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/VersionedBaseTest.java
 
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/VersionedBaseTest.java
index 64183d6..5423d36 100644
--- 
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/VersionedBaseTest.java
+++ 
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/VersionedBaseTest.java
@@ -18,13 +18,16 @@ import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.activemq.artemis.utils.FileUtil;
 import org.apache.activemq.artemis.utils.RunnableEx;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -42,6 +45,8 @@ public abstract class VersionedBaseTest {
protected ClassLoader senderClassloader;
protected ClassLoader receiverClassloader;
 
+   protected static Map loaderMap = new HashMap<>();
+
public VersionedBaseTest(String server, String sender, String receiver) 
throws Exception {
   this.server = server;
   this.sender = sender;
@@ -95,6 +100,11 @@ public abstract class VersionedBaseTest {
   receiverClassloader = null;
}
 
+   @AfterClass
+   public static void cleanup() {
+  loaderMap.clear();
+   }
+
protected static void callMain(ClassLoader loader,
   String className,
   String script,
@@ -125,6 +135,7 @@ public abstract class VersionedBaseTest {
   }
}
 
+
protected static ClassLoader defineClassLoader(String classPath) throws 
MalformedURLException {
   String[] classPathArray = classPath.split(File.pathSeparator);
   URL[] elements = new URL[classPathArray.length];
@@ -140,6 +151,12 @@ public abstract class VersionedBaseTest {
   if (name.equals(SNAPSHOT)) {
  return VersionedBaseTest.class.getClassLoader();
   }
+
+  ClassLoader loader = loaderMap.get(name);
+  if (loader != null) {
+ return loader;
+  }
+
   String value = System.getProperty(name);
 
   if (!printed.contains(name)) {
@@ -159,7 +176,11 @@ public abstract class VersionedBaseTest {
  Assume.assumeTrue("Cannot run these tests, no classpath found", ok);
   }
 
-  return defineClassLoader(value);
+
+  loader = defineClassLoader(value);
+  loaderMap.put(name, loader);
+
+  return loader;
}
 
protected static List combinatory(Object[] rootSide, Object[] 
sideLeft, Object[] sideRight) {

[2/2] activemq-artemis git commit: This closes #1731

[clebertsuconic]

This closes #1731


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/fb34214a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fb34214a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fb34214a

Branch: refs/heads/master
Commit: fb34214a1af6bcfe0a6e871e125b2a38cc416a90
Parents: a3d297f 2197d37
Author: Clebert Suconic 
Authored: Tue Dec 19 12:21:50 2017 -0500
Committer: Clebert Suconic 
Committed: Tue Dec 19 12:21:50 2017 -0500

--
 .../tests/compatibility/VersionedBaseTest.java  | 23 +++-
 1 file changed, 22 insertions(+), 1 deletion(-)
--

Jenkins build is back to stable : ActiveMQ-Artemis-Master #1507

[Apache Jenkins Server]

See 

[1/2] activemq-artemis git commit: This closes #1728

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master a081a1e2b -> a3d297ff9


This closes #1728


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a3d297ff
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a3d297ff
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a3d297ff

Branch: refs/heads/master
Commit: a3d297ff9a4516ae878f1d7dd6ded4f54fdefe98
Parents: a081a1e c202b18
Author: Clebert Suconic 
Authored: Tue Dec 19 09:35:18 2017 -0500
Committer: Clebert Suconic 
Committed: Tue Dec 19 09:35:18 2017 -0500

--
 .../ManagementWithPagingServerTest.java   |  4 +++-
 .../integration/management/QueueControlTest.java  | 18 --
 2 files changed, 15 insertions(+), 7 deletions(-)
--

[2/2] activemq-artemis git commit: NO-JIRA testsuite fixes

[clebertsuconic]

NO-JIRA testsuite fixes


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c202b18d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c202b18d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c202b18d

Branch: refs/heads/master
Commit: c202b18d445749a87e909ad7d81b7ebcb20cdbdd
Parents: a081a1e
Author: Stanislav Knot 
Authored: Mon Dec 18 16:38:18 2017 +0100
Committer: Clebert Suconic 
Committed: Tue Dec 19 09:35:18 2017 -0500

--
 .../ManagementWithPagingServerTest.java   |  4 +++-
 .../integration/management/QueueControlTest.java  | 18 --
 2 files changed, 15 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c202b18d/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java
index e7b95bb..6537450 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementWithPagingServerTest.java
@@ -145,7 +145,9 @@ public class ManagementWithPagingServerTest extends 
ManagementTestBase {
   Assert.assertNotNull(jsonString);
   JsonArray array = JsonUtil.readJsonArray(jsonString);
   Assert.assertEquals(num / 2, array.size());
-  Assert.assertEquals(matchingValue, 
array.getJsonObject(0).getJsonNumber("key").longValue());
+
+  long l = 
Long.parseLong(array.getJsonObject(0).get("key").toString().replaceAll("\"", 
""));
+  Assert.assertEquals(matchingValue, l);
 
   long n = queueControl.countMessages(filter);
   assertEquals(num / 2, n);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c202b18d/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
index d282292..83d2d1c 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -533,7 +533,7 @@ public class QueueControlTest extends ManagementTestBase {
 
   Map[] messages = queueControl.listScheduledMessages();
   Assert.assertEquals(1, messages.length);
-  Assert.assertEquals(intValue, ((Number) 
messages[0].get("key")).intValue());
+  Assert.assertEquals(intValue, 
Integer.parseInt((messages[0].get("key")).toString()));
 
   Thread.sleep(delay + 500);
 
@@ -567,7 +567,8 @@ public class QueueControlTest extends ManagementTestBase {
   Assert.assertNotNull(jsonString);
   JsonArray array = JsonUtil.readJsonArray(jsonString);
   Assert.assertEquals(1, array.size());
-  Assert.assertEquals(intValue, 
array.getJsonObject(0).getJsonNumber("key").intValue());
+  int i = 
Integer.parseInt(array.getJsonObject(0).get("key").toString().replaceAll("\"", 
""));
+  Assert.assertEquals(intValue, i);
 
   Thread.sleep(delay + 500);
 
@@ -700,7 +701,9 @@ public class QueueControlTest extends ManagementTestBase {
   Assert.assertNotNull(jsonString);
   JsonArray array = JsonUtil.readJsonArray(jsonString);
   Assert.assertEquals(1, array.size());
-  Assert.assertEquals(intValue, array.getJsonObject(0).getInt("key"));
+
+  long l = 
Long.parseLong(array.getJsonObject(0).get("key").toString().replaceAll("\"", 
""));
+  Assert.assertEquals(intValue, l);
 
   consumeMessages(1, session, queue);
 
@@ -735,7 +738,7 @@ public class QueueControlTest extends ManagementTestBase {
 
   Map[] messages = queueControl.listMessages(filter);
   Assert.assertEquals(1, messages.length);
-  Assert.assertEquals(matchingValue, messages[0].get("key"));
+  Assert.assertEquals(matchingValue, 
Long.parseLong(messages[0].get("key").toString()));
 
   consumeMessages(2, session, queue);
 
@@ -816,7 +819,9 @@ public class QueueControlTest extends ManagementTestBase {
 

[2/3] activemq-artemis git commit: ARTEMIS-1516 - Ensure JNDI via Tomcat Resource works

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ef98044/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/jndi/ObjectFactoryTest.java
--
diff --git 
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/jndi/ObjectFactoryTest.java
 
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/jndi/ObjectFactoryTest.java
new file mode 100644
index 000..9ceebfd
--- /dev/null
+++ 
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/jms/jndi/ObjectFactoryTest.java
@@ -0,0 +1,138 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.unit.jms.jndi;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.naming.Reference;
+
+import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jndi.JNDIReferenceFactory;
+import org.apache.activemq.artemis.utils.RandomUtil;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ObjectFactoryTest {
+
+   @Test(timeout = 1000)
+   public void testConnectionFactory() throws Exception {
+  // Create sample connection factory
+  ActiveMQConnectionFactory factory = new 
ActiveMQConnectionFactory("vm://0");
+
+  String clientID = RandomUtil.randomString();
+  String user = RandomUtil.randomString();
+  String password = RandomUtil.randomString();
+  long clientFailureCheckPeriod = RandomUtil.randomPositiveLong();
+  long connectionTTL = RandomUtil.randomPositiveLong();
+  long callTimeout = RandomUtil.randomPositiveLong();
+  int minLargeMessageSize = RandomUtil.randomPositiveInt();
+  int consumerWindowSize = RandomUtil.randomPositiveInt();
+  int consumerMaxRate = RandomUtil.randomPositiveInt();
+  int confirmationWindowSize = RandomUtil.randomPositiveInt();
+  int producerMaxRate = RandomUtil.randomPositiveInt();
+  boolean blockOnAcknowledge = RandomUtil.randomBoolean();
+  boolean blockOnDurableSend = RandomUtil.randomBoolean();
+  boolean blockOnNonDurableSend = RandomUtil.randomBoolean();
+  boolean autoGroup = RandomUtil.randomBoolean();
+  boolean preAcknowledge = RandomUtil.randomBoolean();
+  String loadBalancingPolicyClassName = RandomUtil.randomString();
+  boolean useGlobalPools = RandomUtil.randomBoolean();
+  int scheduledThreadPoolMaxSize = RandomUtil.randomPositiveInt();
+  int threadPoolMaxSize = RandomUtil.randomPositiveInt();
+  long retryInterval = RandomUtil.randomPositiveLong();
+  double retryIntervalMultiplier = RandomUtil.randomDouble();
+  int reconnectAttempts = RandomUtil.randomPositiveInt();
+  factory.setClientID(clientID);
+  factory.setUser(user);
+  factory.setPassword(password);
+  factory.setClientFailureCheckPeriod(clientFailureCheckPeriod);
+  factory.setConnectionTTL(connectionTTL);
+  factory.setCallTimeout(callTimeout);
+  factory.setMinLargeMessageSize(minLargeMessageSize);
+  factory.setConsumerWindowSize(consumerWindowSize);
+  factory.setConsumerMaxRate(consumerMaxRate);
+  factory.setConfirmationWindowSize(confirmationWindowSize);
+  factory.setProducerMaxRate(producerMaxRate);
+  factory.setBlockOnAcknowledge(blockOnAcknowledge);
+  factory.setBlockOnDurableSend(blockOnDurableSend);
+  factory.setBlockOnNonDurableSend(blockOnNonDurableSend);
+  factory.setAutoGroup(autoGroup);
+  factory.setPreAcknowledge(preAcknowledge);
+  
factory.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
+  factory.setUseGlobalPools(useGlobalPools);
+  factory.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize);
+  factory.setThreadPoolMaxSize(threadPoolMaxSize);
+  factory.setRetryInterval(retryInterval);
+  factory.setRetryIntervalMultiplier(retryIntervalMultiplier);
+  factory.setReconnectAttempts(reconnectAttempts);
+
+
+  // Create reference
+  Reference ref = 
JNDIRefe

[1/3] activemq-artemis git commit: This closes #1659

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 03ed49e6e -> a081a1e2b


This closes #1659


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a081a1e2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a081a1e2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a081a1e2

Branch: refs/heads/master
Commit: a081a1e2bbe69bf4d0257b7994d592d147a70957
Parents: 03ed49e 3ef9804
Author: Clebert Suconic 
Authored: Tue Dec 19 09:20:35 2017 -0500
Committer: Clebert Suconic 
Committed: Tue Dec 19 09:20:35 2017 -0500

--
 .../activemq/artemis/utils/uri/BeanSupport.java |  34 +
 .../jms/client/ActiveMQConnectionFactory.java   |  52 +--
 .../artemis/jms/client/ActiveMQDestination.java | 126 +
 .../artemis/jms/client/ActiveMQQueue.java   |  29 ++--
 .../jms/client/ActiveMQTemporaryQueue.java  |  10 +-
 .../jms/client/ActiveMQTemporaryTopic.java  |   7 +-
 .../artemis/jms/client/ActiveMQTopic.java   |  26 ++--
 .../ConnectionFactoryObjectFactory.java |  44 --
 .../referenceable/DestinationObjectFactory.java |  44 --
 .../SerializableObjectRefAddr.java  |  71 --
 .../artemis/jndi/JNDIReferenceFactory.java  |  29 ++--
 .../activemq/artemis/jndi/JNDIStorable.java |  60 
 .../amqp/converter/jms/ServerDestination.java   |   9 +-
 .../amqp/converter/jms/ServerJMSMessage.java|   5 +-
 .../ConnectionFactoryObjectFactory.java |  25 
 .../SerializableObjectRefAddr.java  |  31 +
 .../ra/ActiveMQRAConnectionFactoryImpl.java |   6 +-
 ...ctiveMQRAConnectionFactoryObjectFactory.java |  44 ++
 .../SerializableObjectRefAddr.java  |  71 ++
 docs/user-manual/en/SUMMARY.md  |   1 +
 docs/user-manual/en/tomcat.md   |  39 ++
 examples/features/sub-modules/pom.xml   |   3 +-
 examples/features/sub-modules/tomcat/README |  21 +++
 examples/features/sub-modules/tomcat/pom.xml| 127 +
 .../tomcat/sample/SendMessageController.java|  48 +++
 .../sample/SystemOutPrintLnMessageListener.java |  28 
 .../main/webapp/WEB-INF/application-context.xml |  50 +++
 .../main/webapp/WEB-INF/dispatcher-servlet.xml  |  28 
 .../tomcat/src/main/webapp/WEB-INF/web.xml  |  41 ++
 .../tomcat7-maven-plugin/resources/context.xml  |  28 
 .../artemis/jms/tests/ReferenceableTest.java|   9 +-
 .../tests/unit/jms/jndi/ObjectFactoryTest.java  | 138 +++
 .../jms/jndi/StringRefAddrReferenceTest.java| 119 
 .../DestinationObjectFactoryTest.java   |  59 
 .../ra/ConnectionFactoryPropertiesTest.java |   4 +
 .../DestinationObjectFactoryTest.java   |  60 
 36 files changed, 1139 insertions(+), 387 deletions(-)
--

[3/3] activemq-artemis git commit: ARTEMIS-1516 - Ensure JNDI via Tomcat Resource works

[clebertsuconic]

ARTEMIS-1516 - Ensure JNDI via Tomcat Resource works

Apply fix so that when using JNDI via tomcat resource it works. 
Replace original extract of JNDIStorable taken from Qpid, and use ActiveMQ5's 
as fits better to address this issue. (which primary use case is users 
migrating from 5.x)
Refactored ActiveMQConnectionFactory to externalise and turn into reference by 
StringRefAddr's instead of custom RefAddr which isnt standard.
Refactored ActiveMQDestinations similar
Refactored ActiveMQDestination to remove redundent and duplicated name field 
and ensured getters still behave the same


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3ef98044
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3ef98044
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3ef98044

Branch: refs/heads/master
Commit: 3ef98044f88dffedce8a8a40b784eb4d4b6dff1f
Parents: 03ed49e
Author: Michael André Pearce 
Authored: Sat Nov 4 02:26:39 2017 +
Committer: Clebert Suconic 
Committed: Tue Dec 19 09:20:35 2017 -0500

--
 .../activemq/artemis/utils/uri/BeanSupport.java |  34 +
 .../jms/client/ActiveMQConnectionFactory.java   |  52 +--
 .../artemis/jms/client/ActiveMQDestination.java | 126 +
 .../artemis/jms/client/ActiveMQQueue.java   |  29 ++--
 .../jms/client/ActiveMQTemporaryQueue.java  |  10 +-
 .../jms/client/ActiveMQTemporaryTopic.java  |   7 +-
 .../artemis/jms/client/ActiveMQTopic.java   |  26 ++--
 .../ConnectionFactoryObjectFactory.java |  44 --
 .../referenceable/DestinationObjectFactory.java |  44 --
 .../SerializableObjectRefAddr.java  |  71 --
 .../artemis/jndi/JNDIReferenceFactory.java  |  29 ++--
 .../activemq/artemis/jndi/JNDIStorable.java |  60 
 .../amqp/converter/jms/ServerDestination.java   |   9 +-
 .../amqp/converter/jms/ServerJMSMessage.java|   5 +-
 .../ConnectionFactoryObjectFactory.java |  25 
 .../SerializableObjectRefAddr.java  |  31 +
 .../ra/ActiveMQRAConnectionFactoryImpl.java |   6 +-
 ...ctiveMQRAConnectionFactoryObjectFactory.java |  44 ++
 .../SerializableObjectRefAddr.java  |  71 ++
 docs/user-manual/en/SUMMARY.md  |   1 +
 docs/user-manual/en/tomcat.md   |  39 ++
 examples/features/sub-modules/pom.xml   |   3 +-
 examples/features/sub-modules/tomcat/README |  21 +++
 examples/features/sub-modules/tomcat/pom.xml| 127 +
 .../tomcat/sample/SendMessageController.java|  48 +++
 .../sample/SystemOutPrintLnMessageListener.java |  28 
 .../main/webapp/WEB-INF/application-context.xml |  50 +++
 .../main/webapp/WEB-INF/dispatcher-servlet.xml  |  28 
 .../tomcat/src/main/webapp/WEB-INF/web.xml  |  41 ++
 .../tomcat7-maven-plugin/resources/context.xml  |  28 
 .../artemis/jms/tests/ReferenceableTest.java|   9 +-
 .../tests/unit/jms/jndi/ObjectFactoryTest.java  | 138 +++
 .../jms/jndi/StringRefAddrReferenceTest.java| 119 
 .../DestinationObjectFactoryTest.java   |  59 
 .../ra/ConnectionFactoryPropertiesTest.java |   4 +
 .../DestinationObjectFactoryTest.java   |  60 
 36 files changed, 1139 insertions(+), 387 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ef98044/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/BeanSupport.java
--
diff --git 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/BeanSupport.java
 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/BeanSupport.java
index 70b36ab..94a589d 100644
--- 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/BeanSupport.java
+++ 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/BeanSupport.java
@@ -19,12 +19,14 @@ package org.apache.activemq.artemis.utils.uri;
 
 import java.beans.PropertyDescriptor;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 
 import org.apache.commons.beanutils.BeanUtilsBean;
@@ -69,6 +71,38 @@ public class BeanSupport {
   return obj;
}
 
+   public static  P setProperties(P bean, Properties properties)
+  throws IllegalAccessException, NoSuchMethodException, 
InvocationTargetException {
+  synchronized (beanUtils) {
+ PropertyDescriptor[] descriptors = 
beanUtils.getPropertyUtil

Jenkins build is still unstable: ActiveMQ-Artemis-Master #1506

[Apache Jenkins Server]

See 

activemq-artemis git commit: ARTEMIS-1546 Fixing invalid import on test added by accident

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 3ba50574f -> 03ed49e6e


ARTEMIS-1546 Fixing invalid import on test added by accident


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/03ed49e6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/03ed49e6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/03ed49e6

Branch: refs/heads/master
Commit: 03ed49e6e9f7fb6e465d6d424075ecacba23b3f9
Parents: 3ba5057
Author: Clebert Suconic 
Authored: Tue Dec 19 09:16:06 2017 -0500
Committer: Clebert Suconic 
Committed: Tue Dec 19 09:16:23 2017 -0500

--
 .../src/main/resources/meshTest/sendMessages.groovy | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/03ed49e6/tests/compatibility-tests/src/main/resources/meshTest/sendMessages.groovy
--
diff --git 
a/tests/compatibility-tests/src/main/resources/meshTest/sendMessages.groovy 
b/tests/compatibility-tests/src/main/resources/meshTest/sendMessages.groovy
index fdfddee..d13fa2f 100644
--- a/tests/compatibility-tests/src/main/resources/meshTest/sendMessages.groovy
+++ b/tests/compatibility-tests/src/main/resources/meshTest/sendMessages.groovy
@@ -1,6 +1,5 @@
 package meshTest
 
-import org.apache.activemq.artemis.api.core.SimpleString
 import org.apache.activemq.artemis.tests.compatibility.GroovyRun
 
 import javax.jms.*

activemq-artemis git commit: ARTEMIS-1565 Fix server schema

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master a076c50e5 -> 3ba50574f


ARTEMIS-1565 Fix server schema


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3ba50574
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3ba50574
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3ba50574

Branch: refs/heads/master
Commit: 3ba50574fbf4c2230dda982a41a4b1c213ed0a0b
Parents: a076c50
Author: Martyn Taylor 
Authored: Tue Dec 19 14:01:46 2017 +
Committer: Martyn Taylor 
Committed: Tue Dec 19 14:01:46 2017 +

--
 .../src/main/resources/schema/artemis-configuration.xsd  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ba50574/artemis-server/src/main/resources/schema/artemis-configuration.xsd
--
diff --git a/artemis-server/src/main/resources/schema/artemis-configuration.xsd 
b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
index e76478c..4360b02 100644
--- a/artemis-server/src/main/resources/schema/artemis-configuration.xsd
+++ b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
@@ -1445,8 +1445,8 @@
  
   

-   
-   
+
+
 

   
@@ -2180,7 +2180,7 @@

 
  
- 
+ 
 

   How long to wait (in milliseconds) between each vote
@@ -2282,7 +2282,7 @@

 
  
- 
+ 
 

   How long to wait (in milliseconds) between each vote

Jenkins build is still unstable: ActiveMQ-Artemis-Master #1505

[Apache Jenkins Server]

See 

[1/2] activemq-artemis git commit: https://issues.apache.org/jira/browse/ARTEMIS-1565

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master d1c9bc0f2 -> a076c50e5


https://issues.apache.org/jira/browse/ARTEMIS-1565

ARTEMIS-1565 - replica should retry quorum vote

https://issues.apache.org/jira/browse/ARTEMIS-1565


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6067a285
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6067a285
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6067a285

Branch: refs/heads/master
Commit: 6067a285bdbb7e33ad427bf7ea911cc547b1717c
Parents: d1c9bc0
Author: Andy Taylor 
Authored: Tue Dec 19 11:14:50 2017 +
Committer: Andy Taylor 
Committed: Tue Dec 19 11:30:20 2017 +

--
 .../config/ActiveMQDefaultConfiguration.java| 13 +
 .../artemis/core/config/ConfigurationUtils.java |  4 +-
 .../config/ha/ReplicaPolicyConfiguration.java   | 20 +++
 .../ha/ReplicatedPolicyConfiguration.java   | 21 +++
 .../deployers/impl/FileConfigurationParser.java |  8 +++
 .../core/server/cluster/ha/ReplicaPolicy.java   | 28 +-
 .../server/cluster/ha/ReplicatedPolicy.java | 16 +-
 .../core/server/cluster/impl/BridgeImpl.java|  3 +-
 .../server/cluster/qourum/QuorumManager.java| 16 ++
 .../qourum/SharedNothingBackupQuorum.java   | 58 
 .../impl/SharedNothingBackupActivation.java |  2 +-
 .../resources/schema/artemis-configuration.xsd  | 30 ++
 docs/user-manual/en/network-isolation.md| 17 +-
 13 files changed, 216 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6067a285/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index a409ffb..9b5d75d 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -485,6 +485,12 @@ public final class ActiveMQDefaultConfiguration {
 
public static boolean DEFAULT_VOTE_ON_REPLICATION_FAILURE = false;
 
+   //how many times we retry a vote before restarting as a backup
+   private static int DEFAULT_VOTE_RETRIES = 12;
+
+   //how long we wait between votes, 5 secs
+   private static long DEFAULT_VOTE_RETRY_WAIT = 5000;
+
public static int DEFAULT_QUORUM_SIZE = -1;
 
public static final boolean DEFAULT_ANALYZE_CRITICAL = true;
@@ -1334,4 +1340,11 @@ public final class ActiveMQDefaultConfiguration {
}
 
 
+   public static int getDefaultVoteRetries() {
+  return DEFAULT_VOTE_RETRIES;
+   }
+
+   public static long getDefaultVoteRetryWait() {
+  return DEFAULT_VOTE_RETRY_WAIT;
+   }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6067a285/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
index 95f524f..7ea26ae 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
@@ -72,11 +72,11 @@ public final class ConfigurationUtils {
  }
  case REPLICATED: {
 ReplicatedPolicyConfiguration pc = (ReplicatedPolicyConfiguration) 
conf;
-return new ReplicatedPolicy(pc.isCheckForLiveServer(), 
pc.getGroupName(), pc.getClusterName(), pc.getInitialReplicationSyncTimeout(), 
server.getNetworkHealthCheck(), pc.getVoteOnReplicationFailure(), 
pc.getQuorumSize());
+return new ReplicatedPolicy(pc.isCheckForLiveServer(), 
pc.getGroupName(), pc.getClusterName(), pc.getInitialReplicationSyncTimeout(), 
server.getNetworkHealthCheck(), pc.getVoteOnReplicationFailure(), 
pc.getQuorumSize(), pc.getVoteRetries(), pc.getVoteRetryWait());
  }
  case REPLICA: {
 ReplicaPolicyConfiguration pc = (ReplicaPolicyConfiguration) conf;
-return new ReplicaPolicy(pc.getClusterName(), 
pc.getMaxSavedReplicatedJournalsSize(), pc.getGroupName(), 
pc.isRestartBackup(), pc.isAllowFailBack(), 
pc.getInitialReplicationSyncTimeout(), 
getScaleDownPolicy(pc.getScaleDownCon

[2/2] activemq-artemis git commit: This closes #1726

[martyntaylor]

This closes #1726


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a076c50e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a076c50e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a076c50e

Branch: refs/heads/master
Commit: a076c50e538e9c8a8c324126439dcf7111f2945c
Parents: d1c9bc0 6067a28
Author: Martyn Taylor 
Authored: Tue Dec 19 12:32:54 2017 +
Committer: Martyn Taylor 
Committed: Tue Dec 19 12:32:54 2017 +

--
 .../config/ActiveMQDefaultConfiguration.java| 13 +
 .../artemis/core/config/ConfigurationUtils.java |  4 +-
 .../config/ha/ReplicaPolicyConfiguration.java   | 20 +++
 .../ha/ReplicatedPolicyConfiguration.java   | 21 +++
 .../deployers/impl/FileConfigurationParser.java |  8 +++
 .../core/server/cluster/ha/ReplicaPolicy.java   | 28 +-
 .../server/cluster/ha/ReplicatedPolicy.java | 16 +-
 .../core/server/cluster/impl/BridgeImpl.java|  3 +-
 .../server/cluster/qourum/QuorumManager.java| 16 ++
 .../qourum/SharedNothingBackupQuorum.java   | 58 
 .../impl/SharedNothingBackupActivation.java |  2 +-
 .../resources/schema/artemis-configuration.xsd  | 30 ++
 docs/user-manual/en/network-isolation.md| 17 +-
 13 files changed, 216 insertions(+), 20 deletions(-)
--

activemq git commit: AMQ-6847 - fix compilation for java 7

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x 185160c0d -> a5d32da8a


AMQ-6847 - fix compilation for java 7


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a5d32da8
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a5d32da8
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a5d32da8

Branch: refs/heads/activemq-5.14.x
Commit: a5d32da8a143ad541cc484f10fac759c81449482
Parents: 185160c
Author: Christopher L. Shannon (cshannon) 
Authored: Tue Dec 19 07:27:30 2017 -0500
Committer: Christopher L. Shannon (cshannon) 
Committed: Tue Dec 19 07:27:30 2017 -0500

--
 .../test/java/org/apache/activemq/broker/jmx/MBeanTest.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/a5d32da8/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index e0a2ee0..9c83ce4 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -207,10 +207,10 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
 
 
 ObjectName queueViewMBeanName = assertRegisteredObjectName(domain + 
":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + 
getDestinationString());
-QueueViewMBean queue = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, 
QueueViewMBean.class, true);
+final QueueViewMBean queue = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, 
QueueViewMBean.class, true);
 
 ObjectName dlqQueueViewMBeanName = assertRegisteredObjectName(domain + 
":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + 
SharedDeadLetterStrategy.DEFAULT_DEAD_LETTER_QUEUE_NAME );
-QueueViewMBean dlq = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, 
dlqQueueViewMBeanName, QueueViewMBean.class, true);
+final QueueViewMBean dlq = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, 
dlqQueueViewMBeanName, QueueViewMBean.class, true);
 
 assertTrue("messages on dlq", Wait.waitFor(new Wait.Condition() {
 @Override
@@ -258,7 +258,7 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
 echo("Now browsing the second queue");
 
 queueViewMBeanName = assertRegisteredObjectName(domain + 
":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + 
newDestination );
-QueueViewMBean queueNew = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, 
QueueViewMBean.class, true);
+final QueueViewMBean queueNew = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, 
QueueViewMBean.class, true);
 
 long newQueuesize = queueNew.getQueueSize();
 assertEquals("Expect one", 1, newQueuesize);

[1/2] activemq git commit: [AMQ-6847] pause dispatch for message move to avoid redelivery with pending ack/remove/audit rollback

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x 30edca5b2 -> 185160c0d


[AMQ-6847] pause dispatch for message move to avoid redelivery with pending 
ack/remove/audit rollback

(cherry picked from commit 2ea5d1420bbbf90bd151e19a75e6ca33c773f1f4)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/e62705aa
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/e62705aa
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/e62705aa

Branch: refs/heads/activemq-5.14.x
Commit: e62705aa9d7646108e42c321d390189aa26587ba
Parents: 30edca5
Author: gtully 
Authored: Fri Oct 27 11:40:06 2017 +0100
Committer: Christopher L. Shannon (cshannon) 
Committed: Tue Dec 19 07:19:10 2017 -0500

--
 .../apache/activemq/broker/region/Queue.java| 31 +
 .../apache/activemq/broker/jmx/MBeanTest.java   | 47 
 2 files changed, 70 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/e62705aa/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index 6283232..78010e9 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1430,18 +1430,33 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
  * @throws Exception
  */
 public boolean moveMessageTo(ConnectionContext context, 
QueueMessageReference m, ActiveMQDestination dest) throws Exception {
-BrokerSupport.resend(context, m.getMessage(), dest);
-removeMessage(context, m);
-messagesLock.writeLock().lock();
+Set destsToPause = regionBroker.getDestinations(dest);
 try {
-messages.rollback(m.getMessageId());
-if (isDLQ()) {
-DeadLetterStrategy stratagy = getDeadLetterStrategy();
-stratagy.rollback(m.getMessage());
+for (Destination d: destsToPause) {
+if (d instanceof Queue) {
+((Queue)d).pauseDispatch();
+}
+}
+BrokerSupport.resend(context, m.getMessage(), dest);
+removeMessage(context, m);
+messagesLock.writeLock().lock();
+try {
+messages.rollback(m.getMessageId());
+if (isDLQ()) {
+DeadLetterStrategy stratagy = getDeadLetterStrategy();
+stratagy.rollback(m.getMessage());
+}
+} finally {
+messagesLock.writeLock().unlock();
 }
 } finally {
-messagesLock.writeLock().unlock();
+for (Destination d: destsToPause) {
+if (d instanceof Queue) {
+((Queue)d).resumeDispatch();
+}
+}
 }
+
 return true;
 }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/e62705aa/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index 5304424..e79f007 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -54,6 +54,7 @@ import org.apache.activemq.ActiveMQPrefetchPolicy;
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.BlobMessage;
 import org.apache.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.RedeliveryPolicy;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.region.BaseDestination;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
@@ -180,6 +181,52 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
 assertEquals("no forwards", 0, queueNew.getForwardCount());
 }
 
+public void testMoveFromDLQImmediateDLQ() throws Exception {
+
+RedeliveryPolicy redeliveryPolicy = new RedeliveryPolicy();
+redeliveryPolicy.setMaximumRedeliveries(0);
+
((ActiveMQConnectionFactory)connectionFactory).setRedeliveryPolicy(redeliveryPolicy);
+Connection connection = connectionFactory.createConnection();
+
+// populate
+useConnection(connection);
+
+Session session = connection.createSession

[2/2] activemq git commit: [AMQ-6847] limit the retry loop to one iteration overa all pending messages such that new additions are not replayed to avoid duplicates

[cshannon]

[AMQ-6847] limit the retry loop to one iteration overa all pending messages 
such that new additions are not replayed to avoid duplicates

(cherry picked from commit 03b19b9da4d50c3bb8985f930e93596c7d994d26)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/185160c0
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/185160c0
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/185160c0

Branch: refs/heads/activemq-5.14.x
Commit: 185160c0daf955bf7ef43a9440cf5bc9672bd461
Parents: e62705a
Author: gtully 
Authored: Wed Nov 1 11:26:36 2017 +
Committer: Christopher L. Shannon (cshannon) 
Committed: Tue Dec 19 07:19:19 2017 -0500

--
 .../java/org/apache/activemq/broker/region/Queue.java | 10 +++---
 .../java/org/apache/activemq/broker/jmx/MBeanTest.java| 10 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/185160c0/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index 78010e9..1fe4f58 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1443,8 +1443,8 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 try {
 messages.rollback(m.getMessageId());
 if (isDLQ()) {
-DeadLetterStrategy stratagy = getDeadLetterStrategy();
-stratagy.rollback(m.getMessage());
+DeadLetterStrategy strategy = getDeadLetterStrategy();
+strategy.rollback(m.getMessage());
 }
 } finally {
 messagesLock.writeLock().unlock();
@@ -1523,6 +1523,9 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 throw new Exception("Retry of message is only possible on Dead 
Letter Queues!");
 }
 int restoredCounter = 0;
+// ensure we deal with a snapshot to avoid potential duplicates in the 
event of messages
+// getting immediate dlq'ed
+long numberOfRetryAttemptsToCheckAllMessagesOnce = 
this.destinationStatistics.getMessages().getCount();
 Set set = new LinkedHashSet();
 do {
 doPageIn(true);
@@ -1534,6 +1537,7 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 }
 List list = new ArrayList(set);
 for (MessageReference ref : list) {
+numberOfRetryAttemptsToCheckAllMessagesOnce--;
 if (ref.getMessage().getOriginalDestination() != null) {
 
 moveMessageTo(context, (QueueMessageReference)ref, 
ref.getMessage().getOriginalDestination());
@@ -1543,7 +1547,7 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 }
 }
 }
-} while (set.size() < 
this.destinationStatistics.getMessages().getCount() && set.size() < 
maximumMessages);
+} while (numberOfRetryAttemptsToCheckAllMessagesOnce > 0 && set.size() 
< this.destinationStatistics.getMessages().getCount());
 return restoredCounter;
 }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/185160c0/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index e79f007..e0a2ee0 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -206,22 +206,26 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
 }});
 
 
+ObjectName queueViewMBeanName = assertRegisteredObjectName(domain + 
":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + 
getDestinationString());
+QueueViewMBean queue = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, 
QueueViewMBean.class, true);
+
 ObjectName dlqQueueViewMBeanName = assertRegisteredObjectName(domain + 
":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + 
SharedDeadLetterStrategy.DEFAULT_DEAD_LETTER_QUEUE_NAME );
 QueueViewMBean dlq = 
MBeanServerI

[2/2] activemq git commit: [AMQ-6847] limit the retry loop to one iteration overa all pending messages such that new additions are not replayed to avoid duplicates

[cshannon]

[AMQ-6847] limit the retry loop to one iteration overa all pending messages 
such that new additions are not replayed to avoid duplicates

(cherry picked from commit 03b19b9da4d50c3bb8985f930e93596c7d994d26)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0464d532
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0464d532
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0464d532

Branch: refs/heads/activemq-5.15.x
Commit: 0464d53233f95535dfaf8da6adcef9470cb52bdf
Parents: eb9e50f
Author: gtully 
Authored: Wed Nov 1 11:26:36 2017 +
Committer: Christopher L. Shannon (cshannon) 
Committed: Tue Dec 19 07:18:12 2017 -0500

--
 .../java/org/apache/activemq/broker/region/Queue.java | 10 +++---
 .../java/org/apache/activemq/broker/jmx/MBeanTest.java| 10 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/0464d532/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index ac206e3..48cbfbe 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1475,8 +1475,8 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 try {
 messages.rollback(m.getMessageId());
 if (isDLQ()) {
-DeadLetterStrategy stratagy = getDeadLetterStrategy();
-stratagy.rollback(m.getMessage());
+DeadLetterStrategy strategy = getDeadLetterStrategy();
+strategy.rollback(m.getMessage());
 }
 } finally {
 messagesLock.writeLock().unlock();
@@ -1560,6 +1560,9 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 throw new Exception("Retry of message is only possible on Dead 
Letter Queues!");
 }
 int restoredCounter = 0;
+// ensure we deal with a snapshot to avoid potential duplicates in the 
event of messages
+// getting immediate dlq'ed
+long numberOfRetryAttemptsToCheckAllMessagesOnce = 
this.destinationStatistics.getMessages().getCount();
 Set set = new LinkedHashSet();
 do {
 doPageIn(true);
@@ -1571,6 +1574,7 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 }
 List list = new ArrayList(set);
 for (MessageReference ref : list) {
+numberOfRetryAttemptsToCheckAllMessagesOnce--;
 if (ref.getMessage().getOriginalDestination() != null) {
 
 moveMessageTo(context, (QueueMessageReference)ref, 
ref.getMessage().getOriginalDestination());
@@ -1580,7 +1584,7 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 }
 }
 }
-} while (set.size() < 
this.destinationStatistics.getMessages().getCount() && set.size() < 
maximumMessages);
+} while (numberOfRetryAttemptsToCheckAllMessagesOnce > 0 && set.size() 
< this.destinationStatistics.getMessages().getCount());
 return restoredCounter;
 }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/0464d532/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index ecc6894..0ccf1cb 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -206,22 +206,26 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
 }});
 
 
+ObjectName queueViewMBeanName = assertRegisteredObjectName(domain + 
":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + 
getDestinationString());
+QueueViewMBean queue = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, 
QueueViewMBean.class, true);
+
 ObjectName dlqQueueViewMBeanName = assertRegisteredObjectName(domain + 
":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + 
SharedDeadLetterStrategy.DEFAULT_DEAD_LETTER_QUEUE_NAME );
 QueueViewMBean dlq = 
MBeanServerI

[1/2] activemq git commit: [AMQ-6847] pause dispatch for message move to avoid redelivery with pending ack/remove/audit rollback

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x b04b97168 -> 0464d5323


[AMQ-6847] pause dispatch for message move to avoid redelivery with pending 
ack/remove/audit rollback

(cherry picked from commit 2ea5d1420bbbf90bd151e19a75e6ca33c773f1f4)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/eb9e50f3
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/eb9e50f3
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/eb9e50f3

Branch: refs/heads/activemq-5.15.x
Commit: eb9e50f3c9ea9de4777a6c6295ff8065aa3b4252
Parents: b04b971
Author: gtully 
Authored: Fri Oct 27 11:40:06 2017 +0100
Committer: Christopher L. Shannon (cshannon) 
Committed: Tue Dec 19 07:18:01 2017 -0500

--
 .../apache/activemq/broker/region/Queue.java| 31 +
 .../apache/activemq/broker/jmx/MBeanTest.java   | 47 
 2 files changed, 70 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/eb9e50f3/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index fba78cb..ac206e3 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1462,18 +1462,33 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
  * @throws Exception
  */
 public boolean moveMessageTo(ConnectionContext context, 
QueueMessageReference m, ActiveMQDestination dest) throws Exception {
-BrokerSupport.resend(context, m.getMessage(), dest);
-removeMessage(context, m);
-messagesLock.writeLock().lock();
+Set destsToPause = regionBroker.getDestinations(dest);
 try {
-messages.rollback(m.getMessageId());
-if (isDLQ()) {
-DeadLetterStrategy stratagy = getDeadLetterStrategy();
-stratagy.rollback(m.getMessage());
+for (Destination d: destsToPause) {
+if (d instanceof Queue) {
+((Queue)d).pauseDispatch();
+}
+}
+BrokerSupport.resend(context, m.getMessage(), dest);
+removeMessage(context, m);
+messagesLock.writeLock().lock();
+try {
+messages.rollback(m.getMessageId());
+if (isDLQ()) {
+DeadLetterStrategy stratagy = getDeadLetterStrategy();
+stratagy.rollback(m.getMessage());
+}
+} finally {
+messagesLock.writeLock().unlock();
 }
 } finally {
-messagesLock.writeLock().unlock();
+for (Destination d: destsToPause) {
+if (d instanceof Queue) {
+((Queue)d).resumeDispatch();
+}
+}
 }
+
 return true;
 }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/eb9e50f3/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index d72d709..ecc6894 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -54,6 +54,7 @@ import org.apache.activemq.ActiveMQPrefetchPolicy;
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.BlobMessage;
 import org.apache.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.RedeliveryPolicy;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.region.BaseDestination;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
@@ -180,6 +181,52 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
 assertEquals("no forwards", 0, queueNew.getForwardCount());
 }
 
+public void testMoveFromDLQImmediateDLQ() throws Exception {
+
+RedeliveryPolicy redeliveryPolicy = new RedeliveryPolicy();
+redeliveryPolicy.setMaximumRedeliveries(0);
+
((ActiveMQConnectionFactory)connectionFactory).setRedeliveryPolicy(redeliveryPolicy);
+Connection connection = connectionFactory.createConnection();
+
+// populate
+useConnection(connection);
+
+Session session = connection.createSession

Jenkins build is still unstable: ActiveMQ-Java8 #1104

[Apache Jenkins Server]

See 

Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: STOMP Protocol #1104

[Apache Jenkins Server]

See 

Jenkins build is still unstable: ActiveMQ-Java8 » ActiveMQ :: Unit Tests #1104

[Apache Jenkins Server]

See 

Jenkins build became unstable: ActiveMQ-Java8 » ActiveMQ :: Karaf Integration Tests #1104

[Apache Jenkins Server]

See 

activemq git commit: [NO JIRA] harden test occasional failure

[gtully]

Repository: activemq
Updated Branches:
  refs/heads/master 52480a4af -> 22f8f88dd


[NO JIRA] harden test occasional failure


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/22f8f88d
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/22f8f88d
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/22f8f88d

Branch: refs/heads/master
Commit: 22f8f88ddbe050fc991ef816152e1169af29c834
Parents: 52480a4
Author: gtully 
Authored: Tue Dec 19 11:48:47 2017 +
Committer: gtully 
Committed: Tue Dec 19 11:48:47 2017 +

--
 .../src/test/java/org/apache/activemq/spring/ListenerTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/22f8f88d/activemq-spring/src/test/java/org/apache/activemq/spring/ListenerTest.java
--
diff --git 
a/activemq-spring/src/test/java/org/apache/activemq/spring/ListenerTest.java 
b/activemq-spring/src/test/java/org/apache/activemq/spring/ListenerTest.java
index de1fed0..e5c0831 100644
--- a/activemq-spring/src/test/java/org/apache/activemq/spring/ListenerTest.java
+++ b/activemq-spring/src/test/java/org/apache/activemq/spring/ListenerTest.java
@@ -63,7 +63,7 @@ public class ListenerTest {
 
 Wait.waitFor(new Wait.Condition() {
 public boolean isSatisified() throws Exception {
-return (6 * msgNum) <= listener.messages.size();
+return (6 * msgNum) == listener.messages.size();
 }
 });