You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2015/09/08 23:55:18 UTC
[1/2] incubator-geode git commit: GEODE-77 added an expected
ConnectException to a test
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-77 ddae00976 -> 505b45df3
GEODE-77 added an expected ConnectException to a test
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9d016542
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9d016542
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9d016542
Branch: refs/heads/feature/GEODE-77
Commit: 9d01654256e87151000f34702ccb2cf1ab761d14
Parents: ddae009
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Tue Sep 8 14:54:29 2015 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Tue Sep 8 14:54:29 2015 -0700
----------------------------------------------------------------------
.../com/gemstone/gemfire/cache30/BridgeMembershipDUnitTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d016542/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipDUnitTest.java
index 7f6af30..df4ae46 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipDUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/BridgeMembershipDUnitTest.java
@@ -1310,6 +1310,8 @@ public class BridgeMembershipDUnitTest extends BridgeTestCase {
public void testGetConnectedClients() throws Exception {
final String name = this.getUniqueName();
final int[] ports = new int[1];
+
+ addExpectedException("ConnectException");
// create BridgeServer in controller vm...
getLogWriter().info("[testGetConnectedClients] Create BridgeServer");
[2/2] incubator-geode git commit: GEODE-77 fixing NPE encountered in
ProductUseLogDUnitTest
Posted by bs...@apache.org.
GEODE-77 fixing NPE encountered in ProductUseLogDUnitTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/505b45df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/505b45df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/505b45df
Branch: refs/heads/feature/GEODE-77
Commit: 505b45df34f9b2d751c2a21d478f372225725622
Parents: 9d01654
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Tue Sep 8 14:54:50 2015 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Tue Sep 8 14:54:50 2015 -0700
----------------------------------------------------------------------
.../gemfire/distributed/internal/membership/gms/Services.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/505b45df/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
index efc95ac..5f32842 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
@@ -108,7 +108,7 @@ public class Services {
this.joinLeave.init(this);
this.healthMon.init(this);
InternalLocator l = (InternalLocator)com.gemstone.gemfire.distributed.Locator.getLocator();
- if (l != null) {
+ if (l != null && l.getLocatorHandler() != null) {
l.getLocatorHandler().setMembershipManager((MembershipManager)this.manager);
this.locator = (Locator)l.getLocatorHandler();
}