Return-Path: X-Original-To: apmail-xmlgraphics-fop-commits-archive@www.apache.org Delivered-To: apmail-xmlgraphics-fop-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ED4331077D for ; Wed, 4 Dec 2013 16:36:34 +0000 (UTC) Received: (qmail 66032 invoked by uid 500); 4 Dec 2013 16:36:34 -0000 Delivered-To: apmail-xmlgraphics-fop-commits-archive@xmlgraphics.apache.org Received: (qmail 65959 invoked by uid 500); 4 Dec 2013 16:36:30 -0000 Mailing-List: contact fop-commits-help@xmlgraphics.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: fop-dev@xmlgraphics.apache.org Delivered-To: mailing list fop-commits@xmlgraphics.apache.org Received: (qmail 65952 invoked by uid 99); 4 Dec 2013 16:36:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Dec 2013 16:36:29 +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; Wed, 04 Dec 2013 16:36:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2CCF0238889B; Wed, 4 Dec 2013 16:36:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1547838 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java Date: Wed, 04 Dec 2013 16:36:06 -0000 To: fop-commits@xmlgraphics.apache.org From: rmeyer@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131204163606.2CCF0238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmeyer Date: Wed Dec 4 16:36:05 2013 New Revision: 1547838 URL: http://svn.apache.org/r1547838 Log: FOP-1069: No error message on illegal/unknown values on a property Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java?rev=1547838&r1=1547837&r2=1547838&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java Wed Dec 4 16:36:05 2013 @@ -83,14 +83,17 @@ public class GenericShorthandParser impl PropertyList propertyList) throws PropertyException { Property prop = null; + String vProperty = ""; // Try each of the stored values in turn Iterator iprop = property.getList().iterator(); while (iprop.hasNext() && prop == null) { Property p = (Property)iprop.next(); + if (p.getNCname() != null) { + vProperty += p.getNCname() + " "; + } prop = maker.convertShorthandProperty(propertyList, p, null); - // The following produces a regression, about which see FOP-2311. - // propertyList.validatePropertyValue(p.getNCname(), prop, property); } + propertyList.validatePropertyValue(vProperty.trim(), prop, property); return prop; } --------------------------------------------------------------------- To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org