geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject [13/17] geode git commit: Don't throw an error if Redis isn't supposed to start.
Date Wed, 15 Feb 2017 18:54:16 GMT
Don't throw an error if Redis isn't supposed to start.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/452ac17c
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/452ac17c
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/452ac17c

Branch: refs/heads/feature/GEODE-2449
Commit: 452ac17c90a48d13342ec25aa768aaa1e8359867
Parents: c2c5e07
Author: Galen O'Sullivan <gosullivan@pivotal.io>
Authored: Mon Feb 13 16:29:13 2017 -0800
Committer: Galen O'Sullivan <gosullivan@pivotal.io>
Committed: Mon Feb 13 16:29:13 2017 -0800

----------------------------------------------------------------------
 .../java/org/apache/geode/internal/cache/GemFireCacheImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/452ac17c/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 09584b6..6958d55 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -1311,6 +1311,7 @@ public class GemFireCacheImpl
   private void initializeServices() {
     ServiceLoader<CacheService> loader = ServiceLoader.load(CacheService.class);
     for (CacheService service : loader) {
+      logger.error("loading service class " + service.getClass().toString());
       service.init(this);
       this.services.put(service.getInterface(), service);
       system.handleResourceEvent(ResourceEvent.CACHE_SERVICE_CREATE, service);
@@ -1362,7 +1363,7 @@ public class GemFireCacheImpl
     GeodeRedisService geodeRedisService = getService(GeodeRedisService.class);
     if (geodeRedisService != null) {
       geodeRedisService.start();
-    } else {
+    } else if (system.getConfig().getRedisPort() >= 0){
       throw new GemFireConfigException(
           "Geode Redis Service could not be started because it was not registered as a service");
     }


Mime
View raw message