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 072EC200C2B for ; Thu, 2 Mar 2017 15:15:55 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 05C1B160B6F; Thu, 2 Mar 2017 14:15:55 +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 508CB160B61 for ; Thu, 2 Mar 2017 15:15:54 +0100 (CET) Received: (qmail 29798 invoked by uid 500); 2 Mar 2017 14:15:53 -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 29789 invoked by uid 99); 2 Mar 2017 14:15:53 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Mar 2017 14:15:53 +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 092D43A0158 for ; Thu, 2 Mar 2017 14:15:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1785142 - /sling/trunk/bundles/extensions/models/validation-impl/src/main/java/org/apache/sling/models/validation/impl/ModelValidationImpl.java Date: Thu, 02 Mar 2017 14:15:53 -0000 To: commits@sling.apache.org From: kwin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170302141553.092D43A0158@svn01-us-west.apache.org> archived-at: Thu, 02 Mar 2017 14:15:55 -0000 Author: kwin Date: Thu Mar 2 14:15:52 2017 New Revision: 1785142 URL: http://svn.apache.org/viewvc?rev=1785142&view=rev Log: SLING-6531 fix logic of disabling the validator (was inverted) Modified: sling/trunk/bundles/extensions/models/validation-impl/src/main/java/org/apache/sling/models/validation/impl/ModelValidationImpl.java Modified: sling/trunk/bundles/extensions/models/validation-impl/src/main/java/org/apache/sling/models/validation/impl/ModelValidationImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/validation-impl/src/main/java/org/apache/sling/models/validation/impl/ModelValidationImpl.java?rev=1785142&r1=1785141&r2=1785142&view=diff ============================================================================== --- sling/trunk/bundles/extensions/models/validation-impl/src/main/java/org/apache/sling/models/validation/impl/ModelValidationImpl.java (original) +++ sling/trunk/bundles/extensions/models/validation-impl/src/main/java/org/apache/sling/models/validation/impl/ModelValidationImpl.java Thu Mar 2 14:15:52 2017 @@ -65,7 +65,7 @@ public class ModelValidationImpl impleme * Or a {@link InvalidResourceException} in case the given resource (in the adaptable) could not be validated through the {@link ModelValidation}. */ public RuntimeException validate(Object adaptable, Class modelClass, boolean required) throws ValidationException, InvalidModelException { - if (!configuration.disabled()) { + if (configuration.disabled()) { log.debug("Skip validation of model {}, because validation is disabled through the OSGi configuration for ModelValidationConfiguration", modelClass); return null; }