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 2017/08/22 22:36:43 UTC
[41/48] geode git commit: GEODE-3406: Fixed test failures.
GEODE-3406: Fixed test failures.
Now TcpServerFactory doesn't look for protobuf enabled property.
If service is not available then it just ignores that
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/31e82d6d
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/31e82d6d
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/31e82d6d
Branch: refs/heads/feature/GEODE-3447
Commit: 31e82d6d64187ba7a6d71771806a0b107a811c11
Parents: 0cc6043
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Mon Aug 21 14:46:19 2017 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Tue Aug 22 10:56:00 2017 -0700
----------------------------------------------------------------------
.../geode/internal/cache/tier/sockets/TcpServerFactory.java | 9 +++++----
.../apache/geode/test/dunit/standalone/DUnitLauncher.java | 2 --
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/31e82d6d/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java
index 9c6bd8c..a67d6e6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/TcpServerFactory.java
@@ -40,14 +40,15 @@ public class TcpServerFactory {
}
public synchronized ClientProtocolMessageHandler initializeMessageHandler() {
- if (!Boolean.getBoolean("geode.feature-protobuf-protocol")) {
- return null;
- }
if (protocolHandler != null) {
return protocolHandler;
}
- protocolHandler = new MessageHandlerFactory().makeMessageHandler();
+ try {
+ protocolHandler = new MessageHandlerFactory().makeMessageHandler();
+ } catch (ServiceLoadingFailureException ex) {
+ // ignore, TcpServer will take care right now
+ }
return protocolHandler;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/31e82d6d/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
index fd88abf..b35270e 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
@@ -297,8 +297,6 @@ public class DUnitLauncher {
// able to do so successfully anyway
p.setProperty(DISABLE_AUTO_RECONNECT, "true");
- System.setProperty("geode.feature-protobuf-protocol", "true");
-
try {
Locator.startLocatorAndDS(0, locatorLogFile, p);
InternalLocator internalLocator = (InternalLocator) Locator.getLocator();