Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 85447 invoked from network); 15 Dec 2004 16:39:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 15 Dec 2004 16:39:38 -0000 Received: (qmail 56646 invoked by uid 500); 15 Dec 2004 15:57:52 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 43844 invoked by uid 500); 15 Dec 2004 15:53:19 -0000 Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org Received: (qmail 32125 invoked by uid 99); 15 Dec 2004 15:48:44 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 15 Dec 2004 07:48:41 -0800 Received: (qmail 48239 invoked by uid 65534); 15 Dec 2004 15:48:13 -0000 Date: 15 Dec 2004 15:48:13 -0000 Message-ID: <20041215154813.48237.qmail@minotaur.apache.org> From: tripod@apache.org To: jackrabbit-cvs@incubator.apache.org Subject: svn commit: r111980 - /incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: tripod Date: Wed Dec 15 07:48:11 2004 New Revision: 111980 URL: http://svn.apache.org/viewcvs?view=rev&rev=111980 Log: - fix for jira bug JCR-32 Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java Url: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java?view=diff&rev=111980&p1=incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java&r1=111979&p2=incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java&r2=111980 ============================================================================== --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java Wed Dec 15 07:48:11 2004 @@ -29,6 +29,7 @@ import javax.jcr.*; import javax.jcr.nodetype.NodeDef; import javax.jcr.nodetype.PropertyDef; +import javax.jcr.nodetype.ConstraintViolationException; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; @@ -291,7 +292,7 @@ try { // try setting single-value current.node.setProperty(currentPropName, vals[0]); - } catch (ValueFormatException vfe) { + } catch (ConstraintViolationException vfe) { // try setting value array current.node.setProperty(currentPropName, vals); }