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 2018/05/11 16:12:02 UTC
[1/2] activemq-artemis git commit: This closes #2086
Repository: activemq-artemis
Updated Branches:
refs/heads/master 82b5871cf -> 2ea77d3ea
This closes #2086
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2ea77d3e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2ea77d3e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2ea77d3e
Branch: refs/heads/master
Commit: 2ea77d3eae933dfc7bbb72d4a2ed61550be41cf0
Parents: 82b5871 ecb9d46
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri May 11 12:11:52 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri May 11 12:11:52 2018 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 2 +-
.../tests/integration/management/ActiveMQServerControlTest.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1851 avoid exception in
isReplicaSync()
Posted by cl...@apache.org.
ARTEMIS-1851 avoid exception in isReplicaSync()
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ecb9d462
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ecb9d462
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ecb9d462
Branch: refs/heads/master
Commit: ecb9d462cedc2aea002cb49c6cecd4b80c5f93e2
Parents: 82b5871
Author: Justin Bertram <jb...@apache.org>
Authored: Thu May 10 10:44:30 2018 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri May 11 12:11:52 2018 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 2 +-
.../tests/integration/management/ActiveMQServerControlTest.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ecb9d462/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 3a2e91c..cb31b00 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -946,7 +946,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
} else if (activation instanceof SharedNothingBackupActivation) {
return ((SharedNothingBackupActivation) activation).isRemoteBackupUpToDate();
} else {
- throw ActiveMQMessageBundle.BUNDLE.methodNotApplicable();
+ return false;
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ecb9d462/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index d290ec2..cdf7a08 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -180,6 +180,11 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
}
@Test
+ public void testIsReplicaSync() throws Exception {
+ Assert.assertFalse(createManagementControl().isReplicaSync());
+ }
+
+ @Test
public void testGetConnectorsAsJSON() throws Exception {
ActiveMQServerControl serverControl = createManagementControl();