Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 010AC17F44 for ; Wed, 22 Apr 2015 16:04:16 +0000 (UTC) Received: (qmail 48849 invoked by uid 500); 22 Apr 2015 16:04:00 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 48788 invoked by uid 500); 22 Apr 2015 16:04:00 -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 48710 invoked by uid 99); 22 Apr 2015 16:03:59 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 16:03:59 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id CC35DAC0294 for ; Wed, 22 Apr 2015 16:03:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1675397 - /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java Date: Wed, 22 Apr 2015 16:03:59 -0000 To: commits@sling.apache.org From: tommaso@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150422160359.CC35DAC0294@hades.apache.org> Author: tommaso Date: Wed Apr 22 16:03:59 2015 New Revision: 1675397 URL: http://svn.apache.org/r1675397 Log: SLING-4650 - fixed ImportMode property parsing Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java?rev=1675397&r1=1675396&r2=1675397&view=diff ============================================================================== --- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java (original) +++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/serialization/impl/vlt/VaultDistributionPackageBuilderFactory.java Wed Apr 22 16:03:59 2015 @@ -111,7 +111,7 @@ public class VaultDistributionPackageBui packageRoots = SettingsUtils.removeEmptyEntries(packageRoots); ImportMode importMode = null; - if (importMode != null) { + if (importModeString != null) { importMode = ImportMode.valueOf(importModeString); }