aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/fo/properties/Property.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/java/org/apache/fop/fo/properties/Property.java')
-rw-r--r--src/java/org/apache/fop/fo/properties/Property.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/fo/properties/Property.java b/src/java/org/apache/fop/fo/properties/Property.java
index 29e8faac5..a04f96a3c 100644
--- a/src/java/org/apache/fop/fo/properties/Property.java
+++ b/src/java/org/apache/fop/fo/properties/Property.java
@@ -36,7 +36,7 @@ import org.apache.fop.fo.Constants;
public class Property {
/** Logger for all property classes */
- protected static Log log = LogFactory.getLog(PropertyMaker.class);
+ protected static final Log log = LogFactory.getLog(PropertyMaker.class);
/**
* The original specified value for properties which inherit
@@ -197,6 +197,6 @@ public class Property {
if (obj != this) {
return obj.toString();
}
- return null;
+ return "";
}
}