FOP-1069: No error message on illegal/unknown values on a property

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1547838 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java b/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
index 5c7bf417775a1f2548b0ef304bd0869a8ca58e03..140b96aac8092c47492c6bf64f419b3b096976ff 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
+++ b/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
@@ -83,14 +83,17 @@ public class GenericShorthandParser implements ShorthandParser {
                                                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;
     }