You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/11/09 15:23:53 UTC

qpid-broker-j git commit: QPID-8017: [Broker-J] [BDB] Ensure binary compatibility with BDB JE 7.4.5 whilst retaining compatibility with 5.0.104

Repository: qpid-broker-j
Updated Branches:
  refs/heads/6.1.x 92535ae3d -> a559eead5


QPID-8017: [Broker-J] [BDB] Ensure binary compatibility with BDB JE 7.4.5 whilst retaining compatibility with 5.0.104


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/a559eead
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/a559eead
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/a559eead

Branch: refs/heads/6.1.x
Commit: a559eead56dca496204af7090ce62afd344a6792
Parents: 92535ae
Author: Keith Wall <kw...@apache.org>
Authored: Thu Nov 9 14:53:14 2017 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Thu Nov 9 15:23:07 2017 +0000

----------------------------------------------------------------------
 .../store/berkeleydb/replication/ReplicatedEnvironmentFacade.java  | 2 +-
 .../qpid/server/store/berkeleydb/replication/MultiNodeTest.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a559eead/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
index 35a921d..e275ae8 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
@@ -1551,7 +1551,7 @@ public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChan
         replicationEnvironmentParameters.putAll(_configuration.getReplicationParameters());
 
         ReplicationConfig replicationConfig = new ReplicationConfig(groupName, nodeName, hostPort);
-        replicationConfig.setHelperHosts(helperHostPort);
+        replicationConfig.setHelperHostsVoid(helperHostPort);
         replicationConfig.setDesignatedPrimary(designatedPrimary);
         replicationConfig.setNodePriority(priority);
         replicationConfig.setElectableGroupSizeOverride(quorumOverride);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a559eead/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
index b03d9d2..27bfdbb 100644
--- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
+++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/MultiNodeTest.java
@@ -718,7 +718,7 @@ public class MultiNodeTest extends QpidBrokerTestCase
             environmentPathFile.mkdirs();
             ReplicationConfig replicationConfig =
                     new ReplicationConfig(_groupCreator.getGroupName(), nodeName, nodeHostPort);
-            replicationConfig.setHelperHosts(_groupCreator.getHelperHostPort());
+            replicationConfig.setHelperHostsVoid(_groupCreator.getHelperHostPort());
             EnvironmentConfig envConfig = new EnvironmentConfig();
             envConfig.setAllowCreate(true);
             envConfig.setTransactional(true);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org