Make VariableInterpolator serializable.
Its subclasses are serializable, but VariableInterpolator is not. 
VariableInterpolator has no default constructor and any eventual
serialization/deserialization will fail.

Chain its constructors.

suggested-by: findbugs


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/936761ec
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/936761ec
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/936761ec

Branch: refs/heads/master
Commit: 936761ec72a06047b1c846f16d186e0f1eaa1af1
Parents: 152e8b1
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Tue Mar 27 11:15:21 2012 +0200
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Tue Mar 27 11:15:21 2012 +0200

----------------------------------------------------------------------
 .../string/interpolator/VariableInterpolator.java  |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/936761ec/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/VariableInterpolator.java
----------------------------------------------------------------------
diff --git 
a/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/VariableInterpolator.java
 
b/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/VariableInterpolator.java
index f01c175..0223837 100644
--- 
a/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/VariableInterpolator.java
+++ 
b/wicket-util/src/main/java/org/apache/wicket/util/string/interpolator/VariableInterpolator.java
@@ -16,6 +16,8 @@
  */
 package org.apache.wicket.util.string.interpolator;
 
+import org.apache.wicket.util.io.IClusterable;
+
 /**
  * Base class for variable interpolators. An interpolator substitutes values 
into a
  * <code>String</code>. So, a variable interpolator substitutes the values of 
one or more variables
@@ -35,12 +37,12 @@ package org.apache.wicket.util.string.interpolator;
  * @author Jonathan Locke
  * @since 1.2.6
  */
-public abstract class VariableInterpolator
+public abstract class VariableInterpolator implements IClusterable
 {
        /** The <code>String</code> to interpolate into */
        protected final String string;
 
-       private boolean exceptionOnNullVarValue = false;
+       private final boolean exceptionOnNullVarValue;
 
        /**
         * Constructor.
@@ -50,7 +52,7 @@ public abstract class VariableInterpolator
         */
        public VariableInterpolator(final String string)
        {
-               this.string = string;
+               this(string, false);
        }
 
        /**

Reply via email to