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/12/02 19:13:29 UTC
incubator-geode git commit: Fixing a find-bugs issue
Repository: incubator-geode
Updated Branches:
refs/heads/develop ae8c475de -> e19fa40ca
Fixing a find-bugs issue
GMSJoinLeave had a static variable that should have been final but
was not.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e19fa40c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e19fa40c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e19fa40c
Branch: refs/heads/develop
Commit: e19fa40ca5079e0ce6930d60b04245dbfa07d6dd
Parents: ae8c475
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Wed Dec 2 10:12:04 2015 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Wed Dec 2 10:13:08 2015 -0800
----------------------------------------------------------------------
.../internal/membership/gms/membership/GMSJoinLeave.java | 4 ++--
.../distributed/internal/membership/MembershipJUnitTest.java | 4 ++--
gemfire-core/src/test/java/dunit/standalone/DUnitLauncher.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e19fa40c/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index 2f8d734..2f9c514 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -88,7 +88,7 @@ import com.gemstone.gemfire.security.AuthenticationFailedException;
*/
public class GMSJoinLeave implements JoinLeave, MessageHandler {
- public static String BYPASS_DISCOVERY = "gemfire.bypass-discovery";
+ public static final String BYPASS_DISCOVERY_PROPERTY = "gemfire.bypass-discovery";
/** amount of time to wait for responses to FindCoordinatorRequests */
private static final int DISCOVERY_TIMEOUT = Integer.getInteger("gemfire.discovery-timeout", 3000);
@@ -221,7 +221,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
public boolean join() {
try {
- if (Boolean.getBoolean(BYPASS_DISCOVERY)) {
+ if (Boolean.getBoolean(BYPASS_DISCOVERY_PROPERTY)) {
synchronized(viewInstallationLock) {
becomeCoordinator();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e19fa40c/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
index 91889df..2ce1ca7 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
@@ -185,14 +185,14 @@ public class MembershipJUnitTest {
// start the first membership manager
try {
- System.setProperty(GMSJoinLeave.BYPASS_DISCOVERY, "true");
+ System.setProperty(GMSJoinLeave.BYPASS_DISCOVERY_PROPERTY, "true");
DistributedMembershipListener listener1 = mock(DistributedMembershipListener.class);
DMStats stats1 = mock(DMStats.class);
System.out.println("creating 1st membership manager");
m1 = MemberFactory.newMembershipManager(listener1, config, transport, stats1);
m1.startEventProcessing();
} finally {
- System.getProperties().remove(GMSJoinLeave.BYPASS_DISCOVERY);
+ System.getProperties().remove(GMSJoinLeave.BYPASS_DISCOVERY_PROPERTY);
}
// start the second membership manager
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e19fa40c/gemfire-core/src/test/java/dunit/standalone/DUnitLauncher.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/dunit/standalone/DUnitLauncher.java b/gemfire-core/src/test/java/dunit/standalone/DUnitLauncher.java
index ad437c9..f3109f3 100644
--- a/gemfire-core/src/test/java/dunit/standalone/DUnitLauncher.java
+++ b/gemfire-core/src/test/java/dunit/standalone/DUnitLauncher.java
@@ -245,11 +245,11 @@ public class DUnitLauncher {
//Tell the locator it's the first in the system for
//faster boot-up
- System.setProperty(GMSJoinLeave.BYPASS_DISCOVERY, "true");
+ System.setProperty(GMSJoinLeave.BYPASS_DISCOVERY_PROPERTY, "true");
try {
Locator.startLocatorAndDS(locatorPort, locatorLogFile, p);
} finally {
- System.getProperties().remove(GMSJoinLeave.BYPASS_DISCOVERY);
+ System.getProperties().remove(GMSJoinLeave.BYPASS_DISCOVERY_PROPERTY);
}
return null;