tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject [1/4] git commit: Prevent NPE after deserializing
Date Wed, 29 May 2013 17:49:39 GMT
Updated Branches:
  refs/heads/master 5647c47c9 -> 2f245e694


Prevent NPE after deserializing


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/37798513
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/37798513
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/37798513

Branch: refs/heads/master
Commit: 3779851328b96a73a0f6b8d2b758213f48150398
Parents: 5647c47
Author: Howard M. Lewis Ship <hlship@apache.org>
Authored: Wed May 29 10:27:57 2013 -0700
Committer: Howard M. Lewis Ship <hlship@apache.org>
Committed: Wed May 29 10:27:57 2013 -0700

----------------------------------------------------------------------
 .../BaseOptimizedSessionPersistedObject.java       |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/37798513/tapestry-core/src/main/java/org/apache/tapestry5/BaseOptimizedSessionPersistedObject.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/BaseOptimizedSessionPersistedObject.java
b/tapestry-core/src/main/java/org/apache/tapestry5/BaseOptimizedSessionPersistedObject.java
index 2070b39..402328e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/BaseOptimizedSessionPersistedObject.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/BaseOptimizedSessionPersistedObject.java
@@ -14,6 +14,7 @@
 
 package org.apache.tapestry5;
 
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -34,6 +35,10 @@ public abstract class BaseOptimizedSessionPersistedObject implements OptimizedSe
 
     private transient AtomicBoolean dirty = new AtomicBoolean(false);
 
+    private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException
{
+        dirty = new AtomicBoolean(false);
+    }
+
     public final boolean checkAndResetDirtyMarker()
     {
         return dirty.getAndSet(false);


Mime
View raw message