From commits-return-7356-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Mon Apr 06 12:42:10 2009 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 83907 invoked from network); 6 Apr 2009 12:42:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Apr 2009 12:42:09 -0000 Received: (qmail 35453 invoked by uid 500); 6 Apr 2009 12:42:09 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 35384 invoked by uid 500); 6 Apr 2009 12:42:09 -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 35375 invoked by uid 99); 6 Apr 2009 12:42:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2009 12:42:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 06 Apr 2009 12:42:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B7070238896B; Mon, 6 Apr 2009 12:41:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r762315 - in /jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value: SerialValueFactory.java StringValue.java Date: Mon, 06 Apr 2009 12:41:46 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090406124146.B7070238896B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Mon Apr 6 12:41:46 2009 New Revision: 762315 URL: http://svn.apache.org/viewvc?rev=762315&view=rev Log: JCRRMI-17: Multiple TCK test failures Should throw ValueFormatException for invalid date strings. Avoid nulls in value arrays. Modified: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/SerialValueFactory.java jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/StringValue.java Modified: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/SerialValueFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/SerialValueFactory.java?rev=762315&r1=762314&r2=762315&view=diff ============================================================================== --- jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/SerialValueFactory.java (original) +++ jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/SerialValueFactory.java Mon Apr 6 12:41:46 2009 @@ -17,7 +17,9 @@ package org.apache.jackrabbit.rmi.value; import java.io.InputStream; +import java.util.ArrayList; import java.util.Calendar; +import java.util.List; import javax.jcr.Node; import javax.jcr.PropertyType; @@ -68,15 +70,15 @@ * @return array of decorated values */ public static Value[] makeSerialValueArray(Value[] values) { + List serials = new ArrayList(); if (values != null) { - Value[] serials = new Value[values.length]; for (int i = 0; i < values.length; i++) { - serials[i] = makeSerialValue(values[i]); + if (values[i] != null) { + serials.add(makeSerialValue(values[i])); + } } - return serials; - } else { - return new Value[0]; } + return (Value[]) serials.toArray(new Value[serials.size()]); } /** Modified: jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/StringValue.java URL: http://svn.apache.org/viewvc/jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/StringValue.java?rev=762315&r1=762314&r2=762315&view=diff ============================================================================== --- jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/StringValue.java (original) +++ jackrabbit/commons/jcr-rmi/trunk/jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/value/StringValue.java Mon Apr 6 12:41:46 2009 @@ -89,7 +89,12 @@ * Calendar instance. */ public Calendar getDate() throws ValueFormatException { - return ISO8601.parse(value); + Calendar date = ISO8601.parse(value); + if (date != null) { + return date; + } else { + throw new ValueFormatException("Invalid date value: " + value); + } } /**