Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4D269DF6F for ; Thu, 6 Sep 2012 19:28:41 +0000 (UTC) Received: (qmail 94109 invoked by uid 500); 6 Sep 2012 19:28:41 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 94090 invoked by uid 500); 6 Sep 2012 19:28:41 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 94060 invoked by uid 99); 6 Sep 2012 19:28:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2012 19:28:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2012 19:28:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 38DB5238899C; Thu, 6 Sep 2012 19:27:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1381723 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeImpl.java Date: Thu, 06 Sep 2012 19:27:57 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120906192757.38DB5238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Thu Sep 6 19:27:56 2012 New Revision: 1381723 URL: http://svn.apache.org/viewvc?rev=1381723&view=rev Log: OAK-66: JCR Node Type Management type validation: check whether property can be removed when setting property value to null Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeImpl.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeImpl.java?rev=1381723&r1=1381722&r2=1381723&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/type/NodeTypeImpl.java Thu Sep 6 19:27:56 2012 @@ -265,6 +265,10 @@ class NodeTypeImpl implements NodeType { @Override public boolean canSetProperty(String propertyName, Value value) { + if (value == null) { + return canRemoveProperty(propertyName); + } + for (PropertyDefinition definition : getPropertyDefinitions()) { String name = definition.getName(); if ((propertyName.equals(name) && !isProtected(definition)) @@ -280,6 +284,10 @@ class NodeTypeImpl implements NodeType { @Override public boolean canSetProperty(String propertyName, Value[] values) { + if (values == null) { + return canRemoveProperty(propertyName); + } + for (PropertyDefinition definition : getPropertyDefinitions()) { String name = definition.getName(); if ((propertyName.equals(name) && !isProtected(definition))