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 98AFDD7DB for ; Thu, 30 Aug 2012 09:49:41 +0000 (UTC) Received: (qmail 64355 invoked by uid 500); 30 Aug 2012 09:49:41 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 64320 invoked by uid 500); 30 Aug 2012 09:49: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 64301 invoked by uid 99); 30 Aug 2012 09:49:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Aug 2012 09:49:40 +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, 30 Aug 2012 09:49:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0C0AE23888EA; Thu, 30 Aug 2012 09:48:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1378871 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java Date: Thu, 30 Aug 2012 09:48:54 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120830094855.0C0AE23888EA@eris.apache.org> Author: jukka Date: Thu Aug 30 09:48:54 2012 New Revision: 1378871 URL: http://svn.apache.org/viewvc?rev=1378871&view=rev Log: OAK-66: JCR Node Type Management Temporary fallback for cases where content doesn't match type defintions. Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java?rev=1378871&r1=1378870&r2=1378871&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyImpl.java Thu Aug 30 09:48:54 2012 @@ -571,6 +571,18 @@ public class PropertyImpl extends ItemIm } } + // FIXME: Shouldn't be needed + for (NodeType nt : getAllNodeTypes(getParent())) { + for (PropertyDefinition def : nt.getDeclaredPropertyDefinitions()) { + String defName = def.getName(); + if ((name.equals(defName) || "*".equals(defName)) + && type == PropertyType.STRING + && isMultiple() == def.isMultiple()) { + return def; + } + } + } + throw new RepositoryException( "No matching property definition found for " + this); }