Return-Path: <commits-return-21538-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 6747D200CEC
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 10 Jul 2017 20:18:36 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 65FDF1651FF; Mon, 10 Jul 2017 18:18:36 +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 87AE716520C
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 10 Jul 2017 20:18:34 +0200 (CEST)
Received: (qmail 24345 invoked by uid 500); 10 Jul 2017 18:18:33 -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 24208 invoked by uid 99); 10 Jul 2017 18:18:33 -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 18:18:33 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id B4DE6F5534; Mon, 10 Jul 2017 18:18:31 +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 18:19:01 -0000
Message-Id: <4e3df7422a264ca7a8b2bbcb59d27302@git.apache.org>
In-Reply-To: <4a30827b16024643b089a70b856cfba2@git.apache.org>
References: <4a30827b16024643b089a70b856cfba2@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [32/50] [abbrv] tinkerpop git commit: Didn't account for a null value
 in the config
archived-at: Mon, 10 Jul 2017 18:18:36 -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/402678b1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/402678b1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/402678b1

Branch: refs/heads/TINKERPOP-1698
Commit: 402678b1bb6bfb9f6c94dd1281969018d1b2637a
Parents: 77d6dfd
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:17:49 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/402678b1/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) {