corresponding.compute() may also return null to indicate that the inherited value...

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

diff --git a/src/java/org/apache/fop/fo/properties/PropertyMaker.java b/src/java/org/apache/fop/fo/properties/PropertyMaker.java
index 179e567104206f6c90a05f0af4c0895031e8c48b..51116fbafb9d7f7a757b47b043781ddcb96cebf4 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/PropertyMaker.java
+++ b/src/java/org/apache/fop/fo/properties/PropertyMaker.java
@@ -255,12 +255,12 @@ public class PropertyMaker implements Cloneable {
             if (p == null) {    // check for shorthand specification
                 p = getShorthand(propertyList);
             }
-            if (p == null && bTryInherit) {    
-                // else inherit (if has parent and is inheritable)
-                PropertyList parentPropertyList = propertyList.getParentPropertyList(); 
-                if (parentPropertyList != null && isInherited()) {
-                    p = parentPropertyList.get(propId, true, false);
-                }
+        }
+        if (p == null && bTryInherit) {    
+            // else inherit (if has parent and is inheritable)
+            PropertyList parentPropertyList = propertyList.getParentPropertyList(); 
+            if (parentPropertyList != null && isInherited()) {
+                p = parentPropertyList.get(propId, true, false);
             }
         }
         return p;