Return-Path: <commits-return-16902-archive-asf-public=cust-asf.ponee.io@geode.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 9C06E200C2B
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 15 Feb 2017 19:54:06 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 9AAE6160B71; Wed, 15 Feb 2017 18:54:06 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id E4403160B7A
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 15 Feb 2017 19:54:05 +0100 (CET)
Received: (qmail 75710 invoked by uid 500); 15 Feb 2017 18:54:05 -0000
Mailing-List: contact commits-help@geode.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@geode.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@geode.apache.org>
List-Post: <mailto:commits@geode.apache.org>
List-Id: <commits.geode.apache.org>
Reply-To: dev@geode.apache.org
Delivered-To: mailing list commits@geode.apache.org
Received: (qmail 75171 invoked by uid 99); 15 Feb 2017 18:54:04 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Feb 2017 18:54:04 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 9A160E04B2; Wed, 15 Feb 2017 18:54:04 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bschuchardt@apache.org
To: commits@geode.apache.org
Date: Wed, 15 Feb 2017 18:54:16 -0000
Message-Id: <fcd645e5e2e2438184d56f21211a13f9@git.apache.org>
In-Reply-To: <baa2a43059044901961dbd26eee156d4@git.apache.org>
References: <baa2a43059044901961dbd26eee156d4@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [13/17] geode git commit: Don't throw an error if Redis isn't
 supposed to start.
archived-at: Wed, 15 Feb 2017 18:54:06 -0000

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");
     }