Merge from Trunk, revisions 965390 to 1060234.

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

1 files changed, 8 insertions, 3 deletions

diff --git a/src/java/org/apache/fop/area/AreaTreeParser.java b/src/java/org/apache/fop/area/AreaTreeParser.java
index e41f5e873..ae7c0a7c3 100644
--- a/src/java/org/apache/fop/area/AreaTreeParser.java
+++ b/src/java/org/apache/fop/area/AreaTreeParser.java
@@ -98,7 +98,7 @@ import org.apache.fop.util.XMLUtil;
 public class AreaTreeParser {
 
     /** Logger instance */
-    protected static Log log = LogFactory.getLog(AreaTreeParser.class);
+    protected static final Log log = LogFactory.getLog(AreaTreeParser.class);
 
     private static SAXTransformerFactory tFactory
         = (SAXTransformerFactory)SAXTransformerFactory.newInstance();
@@ -228,8 +228,13 @@ public class AreaTreeParser {
             if (areaStack.size() > 0) {
                 int pos = areaStack.size() - 1;
                 Object obj = null;
-                while (pos >= 0 && !(clazz.isInstance(obj = areaStack.get(pos)))) {
-                    pos--;
+                while ( pos >= 0 ) {
+                    obj = areaStack.get(pos);
+                    if ( clazz.isInstance ( obj ) ) {
+                        break;
+                    } else {
+                        pos--;
+                    }
                 }
                 if (pos >= 0) {
                     return (Area)obj;