From 0d7d578e42ab98e3ccc30efc483f8aa0d9542085 Mon Sep 17 00:00:00 2001
From: Cristiano Nicolai
Date: Fri, 11 Feb 2011 09:24:20 +1000
Subject: [PATCH] AbortWorkItem should test if WorkItemInfo inst null before merge

---
 .../jpa/processinstance/JPAWorkItemManager.java    |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/processinstance/JPAWorkItemManager.java b/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/processinstance/JPAWorkItemManager.java
index cf4088d..f528d0d 100644
--- a/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/processinstance/JPAWorkItemManager.java
+++ b/drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/processinstance/JPAWorkItemManager.java
@@ -133,7 +133,9 @@ public class JPAWorkItemManager implements WorkItemManager {
         WorkItemInfo workItemInfo = null;
         if (this.workItems != null) {
 	    	workItemInfo = this.workItems.get(id);
-	    	context.merge(workItemInfo);
+	    	if (workItemInfo != null) {
+	    		workItemInfo = context.merge(workItemInfo);
+	    	}
     	}
         
         if (workItemInfo == null) {
-- 
1.7.3.4