From: Jeremias Maerki <jeremias@apache.org>
Date: Fri, 28 Jan 2005 14:26:44 +0000 (+0000)
Subject: corresponding.compute() may also return null to indicate that the inherited value... 
X-Git-Tag: Root_Temp_KnuthStylePageBreaking~172
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dd518f08853fed331f93d297aa520ef91be858e4;p=xmlgraphics-fop.git

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


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 179e56710..51116fbaf 100644
--- 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;