Fixing issue with serializable updates on deleted variable instances

yipai · Jun 18, 2013 · c9d0a8c · c9d0a8c
1 parent fe3af0d
commit c9d0a8c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...ine/src/main/java/org/activiti/engine/impl/persistence/entity/VariableInstanceEntity.java b/...ine/src/main/java/org/activiti/engine/impl/persistence/entity/VariableInstanceEntity.java
@@ -49,6 +49,7 @@ public class VariableInstanceEntity implements ValueFields, PersistentObject, Ha
 
   protected Object cachedValue;
   protected boolean forcedUpdate;
+  protected boolean deleted = false;
 
   // Default constructor for SQL mapping
   protected VariableInstanceEntity() {
@@ -85,6 +86,7 @@ public void delete() {
       .delete(this);
 
     byteArrayRef.delete();
+    deleted = true; 
   }
 
   public Object getPersistentState() {
@@ -113,6 +115,11 @@ public Object getPersistentState() {
   public int getRevisionNext() {
     return revision+1;
   }
+
+
+  public boolean isDeleted() {
+    return deleted;
+  }
 
   // lazy initialized relations ///////////////////////////////////////////////
 

diff --git a/...s/activiti-engine/src/main/java/org/activiti/engine/impl/variable/DeserializedObject.java b/...s/activiti-engine/src/main/java/org/activiti/engine/impl/variable/DeserializedObject.java
@@ -34,7 +34,7 @@ public DeserializedObject(Object deserializedObject, byte[] serializedBytes, Var
 
   public void flush() {
     // this first check verifies if the variable value was not overwritten with another object
-    if (deserializedObject==variableInstanceEntity.getCachedValue()) {
+    if (deserializedObject==variableInstanceEntity.getCachedValue() && !variableInstanceEntity.isDeleted()) {
       byte[] bytes = SerializableType.serialize(deserializedObject, variableInstanceEntity);
       if (!Arrays.equals(originalBytes, bytes)) {
         variableInstanceEntity.setBytes(bytes);