Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 45626 invoked from network); 8 Dec 2006 15:36:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Dec 2006 15:36:41 -0000 Received: (qmail 20915 invoked by uid 500); 8 Dec 2006 15:36:49 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 20888 invoked by uid 500); 8 Dec 2006 15:36:49 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 20879 invoked by uid 99); 8 Dec 2006 15:36:49 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Dec 2006 07:36:49 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Dec 2006 07:36:40 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id B7CC01A9846; Fri, 8 Dec 2006 07:35:57 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r484644 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/PropInfo.java Date: Fri, 08 Dec 2006 15:35:57 -0000 To: commits@jackrabbit.apache.org From: stefan@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061208153557.B7CC01A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan Date: Fri Dec 8 07:35:55 2006 New Revision: 484644 URL: http://svn.apache.org/viewvc?view=rev&rev=484644 Log: JCR-659 Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/PropInfo.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/PropInfo.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/PropInfo.java?view=diff&rev=484644&r1=484643&r2=484644 ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/PropInfo.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/PropInfo.java Fri Dec 8 07:35:55 2006 @@ -133,18 +133,23 @@ } // multi- or single-valued property? - if (va.length == 1) { - // could be single- or multi-valued (n == 1) + if (va.length == 1 && !def.isMultiple()) { + Exception e = null; try { - // try setting single-value + // set single-value node.setProperty(name, va[0]); } catch (ValueFormatException vfe) { - // try setting value array - node.setProperty(name, va, type); + e = vfe; } catch (ConstraintViolationException cve) { - // try setting value array + e = cve; + } + if (e != null) { + // setting single-value failed, try setting value array + // as a last resort (in case there are ambiguous property + // definitions) node.setProperty(name, va, type); } + // } else { // can only be multi-valued (n == 0 || n > 1) node.setProperty(name, va, type);