Return-Path: <commits-return-21597-archive-asf-public=cust-asf.ponee.io@tinkerpop.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 EE463200CC1
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 10 Jul 2017 23:25:46 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id ECEBE164583; Mon, 10 Jul 2017 21:25:46 +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 7949F164547
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 10 Jul 2017 23:25:45 +0200 (CEST)
Received: (qmail 3296 invoked by uid 500); 10 Jul 2017 21:25:44 -0000
Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@tinkerpop.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@tinkerpop.apache.org>
List-Post: <mailto:commits@tinkerpop.apache.org>
List-Id: <commits.tinkerpop.apache.org>
Reply-To: dev@tinkerpop.apache.org
Delivered-To: mailing list commits@tinkerpop.apache.org
Received: (qmail 3213 invoked by uid 99); 10 Jul 2017 21:25:44 -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; Mon, 10 Jul 2017 21:25:44 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 88C24F551B; Mon, 10 Jul 2017 21:25:43 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: spmallette@apache.org
To: commits@tinkerpop.apache.org
Date: Mon, 10 Jul 2017 21:25:56 -0000
Message-Id: <f59bba3bac4847d7ba21cb907dafe58f@git.apache.org>
In-Reply-To: <d56bfe1798ee406f8ddc6c03db5d89c3@git.apache.org>
References: <d56bfe1798ee406f8ddc6c03db5d89c3@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [14/50] [abbrv] tinkerpop git commit: Didn't account for a null value
 in the config
archived-at: Mon, 10 Jul 2017 21:25:47 -0000

Didn't account for a null value in the config

When the warn message got added it didn't account for null configs. CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8880118d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8880118d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8880118d

Branch: refs/heads/TINKERPOP-1427
Commit: 8880118d05465571663291e0a70c9a3df22bda5c
Parents: e12cc7c
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Thu Jul 6 10:13:18 2017 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Thu Jul 6 10:13:18 2017 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/server/AbstractChannelizer.java       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8880118d/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index 0a784d9..476cdd5 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@ -200,16 +200,17 @@ public abstract class AbstractChannelizer extends ChannelInitializer<SocketChann
                 }
 
                 final MessageSerializer serializer = (MessageSerializer) clazz.newInstance();
-                final Map<String, Graph> graphsDefinedAtStartup = new HashMap<String, Graph>();
+                final Map<String, Graph> graphsDefinedAtStartup = new HashMap<>();
                 for (String graphName : settings.graphs.keySet()) {
                     graphsDefinedAtStartup.put(graphName, graphManager.getGraph(graphName));
                 }
 
-                if (config.config.containsKey(AbstractGryoMessageSerializerV1d0.TOKEN_USE_MAPPER_FROM_GRAPH))
-                    logger.warn("{} utilizes the {} configuration setting which is deprecated - prefer use of {}", config.className, AbstractGryoMessageSerializerV1d0.TOKEN_USE_MAPPER_FROM_GRAPH, AbstractGryoMessageSerializerV1d0.TOKEN_IO_REGISTRIES);
+                if (config.config != null) {
+                    if (config.config.containsKey(AbstractGryoMessageSerializerV1d0.TOKEN_USE_MAPPER_FROM_GRAPH))
+                        logger.warn("{} utilizes the {} configuration setting which is deprecated - prefer use of {}", config.className, AbstractGryoMessageSerializerV1d0.TOKEN_USE_MAPPER_FROM_GRAPH, AbstractGryoMessageSerializerV1d0.TOKEN_IO_REGISTRIES);
 
-                if (config.config != null)
                     serializer.configure(config.config, graphsDefinedAtStartup);
+                }
 
                 return Optional.ofNullable(serializer);
             } catch (ClassNotFoundException cnfe) {