Return-Path: 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 DBDC2200BEF for ; Wed, 4 Jan 2017 15:44:50 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id DA513160B39; Wed, 4 Jan 2017 14:44:50 +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 30A50160B44 for ; Wed, 4 Jan 2017 15:44:50 +0100 (CET) Received: (qmail 76808 invoked by uid 500); 4 Jan 2017 14:44:49 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 76799 invoked by uid 99); 4 Jan 2017 14:44:49 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jan 2017 14:44:49 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 882A13A20C5 for ; Wed, 4 Jan 2017 14:44:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1777322 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ Date: Wed, 04 Jan 2017 14:44:47 -0000 To: commits@sling.apache.org From: tmaret@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170104144448.882A13A20C5@svn01-us-west.apache.org> archived-at: Wed, 04 Jan 2017 14:44:51 -0000 Author: tmaret Date: Wed Jan 4 14:44:47 2017 New Revision: 1777322 URL: http://svn.apache.org/viewvc?rev=1777322&view=rev Log: SLING-6434 - serviceName configurations must be considered null when empty/blank Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java?rev=1777322&r1=1777321&r2=1777322&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ForwardDistributionAgentFactory.java Wed Jan 4 14:44:47 2017 @@ -226,7 +226,7 @@ public class ForwardDistributionAgentFac @Override protected SimpleDistributionAgent createAgent(String agentName, BundleContext context, Map config, DefaultDistributionLog distributionLog) { - String serviceName = PropertiesUtil.toString(config.get(SERVICE_NAME), null); + String serviceName = SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(SERVICE_NAME), null)); String[] allowedRoots = PropertiesUtil.toStringArray(config.get(ALLOWED_ROOTS), null); allowedRoots = SettingsUtils.removeEmptyEntries(allowedRoots); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java?rev=1777322&r1=1777321&r2=1777322&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/QueueDistributionAgentFactory.java Wed Jan 4 14:44:47 2017 @@ -168,7 +168,7 @@ public class QueueDistributionAgentFacto @Override protected SimpleDistributionAgent createAgent(String agentName, BundleContext context, Map config, DefaultDistributionLog distributionLog) { - String serviceName = PropertiesUtil.toString(config.get(SERVICE_NAME), null); + String serviceName = SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(SERVICE_NAME), null)); String[] allowedRoots = PropertiesUtil.toStringArray(config.get(ALLOWED_ROOTS), null); allowedRoots = SettingsUtils.removeEmptyEntries(allowedRoots); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java?rev=1777322&r1=1777321&r2=1777322&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/ReverseDistributionAgentFactory.java Wed Jan 4 14:44:47 2017 @@ -183,7 +183,7 @@ public class ReverseDistributionAgentFac @Override protected SimpleDistributionAgent createAgent(String agentName, BundleContext context, Map config, DefaultDistributionLog distributionLog) { - String serviceName = PropertiesUtil.toString(config.get(SERVICE_NAME), null); + String serviceName = SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(SERVICE_NAME), null)); boolean queueProcessingEnabled = PropertiesUtil.toBoolean(config.get(QUEUE_PROCESSING_ENABLED), true); String[] exporterEndpoints = PropertiesUtil.toStringArray(config.get(EXPORTER_ENDPOINTS), new String[0]); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java?rev=1777322&r1=1777321&r2=1777322&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SimpleDistributionAgentFactory.java Wed Jan 4 14:44:47 2017 @@ -35,6 +35,7 @@ import org.apache.sling.api.resource.Res import org.apache.sling.commons.osgi.PropertiesUtil; import org.apache.sling.distribution.agent.DistributionAgent; import org.apache.sling.distribution.component.impl.DistributionComponentConstants; +import org.apache.sling.distribution.component.impl.SettingsUtils; import org.apache.sling.distribution.event.impl.DistributionEventFactory; import org.apache.sling.distribution.log.impl.DefaultDistributionLog; import org.apache.sling.distribution.monitor.impl.SimpleDistributionAgentMBean; @@ -160,7 +161,7 @@ public class SimpleDistributionAgentFact @Override protected SimpleDistributionAgent createAgent(String agentName, BundleContext context, Map config, DefaultDistributionLog distributionLog) { - String serviceName = PropertiesUtil.toString(config.get(SERVICE_NAME), null); + String serviceName = SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(SERVICE_NAME), null)); boolean queueProcessingEnabled = PropertiesUtil.toBoolean(config.get(QUEUE_PROCESSING_ENABLED), true); Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java?rev=1777322&r1=1777321&r2=1777322&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/agent/impl/SyncDistributionAgentFactory.java Wed Jan 4 14:44:47 2017 @@ -208,7 +208,7 @@ public class SyncDistributionAgentFactor @Override protected SimpleDistributionAgent createAgent(String agentName, BundleContext context, Map config, DefaultDistributionLog distributionLog) { - String serviceName = PropertiesUtil.toString(config.get(SERVICE_NAME), null); + String serviceName = SettingsUtils.removeEmptyEntry(PropertiesUtil.toString(config.get(SERVICE_NAME), null)); boolean queueProcessingEnabled = PropertiesUtil.toBoolean(config.get(QUEUE_PROCESSING_ENABLED), true); String[] passiveQueues = PropertiesUtil.toStringArray(config.get(PASSIVE_QUEUES), new String[0]);