svn commit: r527588 - in /incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa: ActivityRecoveryDAOImpl.java ProcessInstanceDAOImpl.java

[mr...@apache.org]

Author: mriou
Date: Wed Apr 11 10:51:51 2007
New Revision: 527588

URL: http://svn.apache.org/viewvc?view=rev&rev=527588
Log:
Fixed a couple of bugs in JPA recovery.

Modified:
    incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java
    incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java

Modified: incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java?view=diff&rev=527588&r1=527587&r2=527588
==============================================================================
--- incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java (original)
+++ incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ActivityRecoveryDAOImpl.java Wed Apr 11 10:51:51 2007
@@ -29,6 +29,8 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
@@ -40,7 +42,11 @@
 @Table(name="ODE_ACTIVITY_RECOVERY")
 public class ActivityRecoveryDAOImpl implements ActivityRecoveryDAO {
 
-	@Id @Column(name="ACTIVITY_ID")
+    @Id @Column(name="ID")
+    @GeneratedValue(strategy= GenerationType.AUTO)
+    private Long _id;
+
+	@Basic @Column(name="ACTIVITY_ID")
     private long _activityId;
 	@Basic @Column(name="CHANNEL")
     private String _channel;

Modified: incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java?view=diff&rev=527588&r1=527587&r2=527588
==============================================================================
--- incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java (original)
+++ incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/ProcessInstanceDAOImpl.java Wed Apr 11 10:51:51 2007
@@ -54,7 +54,6 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -105,12 +104,11 @@
 	public void createActivityRecovery(String channel, long activityId,
 			String reason, Date dateTime, Element data, String[] actions,
 			int retries) {
-
 		ActivityRecoveryDAOImpl ar = new ActivityRecoveryDAOImpl(channel, activityId, reason, dateTime, data, actions, retries);
-		_recoveries.add(ar);
+        _recoveries.add(ar);
         ar.setInstance(this);
         _lastRecovery = dateTime;
-	}
+    }
 
 	public ScopeDAO createScope(ScopeDAO parentScope, String name, int scopeModelId) {
 		ScopeDAOImpl ret = new ScopeDAOImpl((ScopeDAOImpl)parentScope,name,scopeModelId,this);
@@ -130,14 +128,14 @@
 	}
 
 	public void deleteActivityRecovery(String channel) {
-		for (Iterator itr=_recoveries.iterator(); itr.hasNext(); ) {
-			ActivityRecoveryDAO arElement = (ActivityRecoveryDAO)itr.next();
-			if ( arElement.getChannel().equals(channel)) {
-				itr.remove();
-				return;
-			}
-		}
-	}
+        for (ActivityRecoveryDAO _recovery : _recoveries) {
+            ActivityRecoveryDAOImpl arElement = (ActivityRecoveryDAOImpl) _recovery;
+            if (arElement.getChannel().equals(channel)) {
+                getEM().remove(arElement);
+                return;
+            }
+        }
+    }
 
 	public void finishCompletion() {
 	    // make sure we have completed.