Missing file from r620283

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

1 files changed, 12 insertions, 1 deletions

diff --git a/src/java/org/apache/fop/fo/expr/PropertyException.java b/src/java/org/apache/fop/fo/expr/PropertyException.java
index d9a0b2edd..16055a738 100644
--- a/src/java/org/apache/fop/fo/expr/PropertyException.java
+++ b/src/java/org/apache/fop/fo/expr/PropertyException.java
@@ -36,11 +36,22 @@ public class PropertyException extends FOPException {
     }
 
     /**
+     * Constructor
+     * @param the Exception causing this PropertyException
+     */
+    public PropertyException(Exception cause) {
+        super(cause);
+        if (cause instanceof PropertyException) {
+            this.propertyName = ((PropertyException)cause).propertyName;
+        }
+    }
+    
+    /**
      * Sets the property context information.
      * @param propInfo the property info instance
      */
     public void setPropertyInfo(PropertyInfo propInfo) {
-        setLocator(propInfo.getFO().getLocator());
+        setLocator(propInfo.getPropertyList().getFObj().getLocator());
         propertyName = propInfo.getPropertyMaker().getName();
     }