Author: tv
Date: Fri Jan 15 12:58:04 2016
New Revision: 1724791
URL: http://svn.apache.org/viewvc?rev=1724791&view=rev
Log:
Handle XSTREAM serialization/deserialization
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java?rev=1724791&r1=1724790&r2=1724791&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
Fri Jan 15 12:58:04 2016
@@ -53,13 +53,13 @@ public class TurbinePipeline
/**
* The set of Valves associated with this Pipeline.
*/
- private CopyOnWriteArrayList<Valve> valves = new
CopyOnWriteArrayList<Valve>();
+ private transient CopyOnWriteArrayList<Valve> valves = new
CopyOnWriteArrayList<Valve>();
/**
* The per-thread execution state for processing through this
* pipeline.
*/
- private ThreadLocal<Iterator<Valve>> state = new
ThreadLocal<Iterator<Valve>>();
+ private transient ThreadLocal<Iterator<Valve>> state = new
ThreadLocal<Iterator<Valve>>();
/**
* @see org.apache.turbine.pipeline.Pipeline#initialize()
@@ -73,6 +73,11 @@ public class TurbinePipeline
state = new ThreadLocal<Iterator<Valve>>();
}
+ if (valves == null)
+ {
+ valves = new CopyOnWriteArrayList<Valve>();
+ }
+
// Valve implementations are added to this Pipeline using the
// Mapper.
