Fixed jpa clearState()

orbit · Apr 13, 2015 · 1d63188 · 1d63188
1 parent e03da8f
commit 1d63188
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/actors/providers/jpa/src/main/java/com/ea/orbit/actors/providers/jpa/JpaStorageProvider.java b/actors/providers/jpa/src/main/java/com/ea/orbit/actors/providers/jpa/JpaStorageProvider.java
@@ -61,8 +61,10 @@ public synchronized Task<Void> clearState(final ActorReference<?> reference, fin
     {
         try
         {
+            String stateId = getIdentity(reference);
             EntityManager em = emf.createEntityManager();
-            Query query = em.createQuery("delete from " + state.getClass().getSimpleName());
+            Query query = em.createQuery("delete from " + state.getClass().getSimpleName() + " s where s.stateId=:stateId");
+            query.setParameter("stateId", stateId);
             em.getTransaction().begin();
             query.executeUpdate();
             em.getTransaction().commit();

diff --git a/...roviders/jpa/src/test/java/com/ea/orbit/actors/providers/jpa/test/JpaPersistenceTest.java b/...roviders/jpa/src/test/java/com/ea/orbit/actors/providers/jpa/test/JpaPersistenceTest.java
@@ -78,10 +78,14 @@ public void checkClearTest() throws Exception
     {
         OrbitStage stage = createStage();
         assertEquals(0, count(IHelloActor.class));
-        IHelloActor helloActor = IActor.getReference(IHelloActor.class, "300");
+        IHelloActor helloActor1 = IActor.getReference(IHelloActor.class, "300");
-        helloActor.sayHello("Meep Meep").join();
+        helloActor1.sayHello("Meep Meep").join();
+        IHelloActor helloActor2 = IActor.getReference(IHelloActor.class, "301");
+        helloActor2.sayHello("Meep Meep").join();
+        assertEquals(2, count(IHelloActor.class));
+        helloActor1.clear().join();
         assertEquals(1, count(IHelloActor.class));
-        helloActor.clear().join();
+        helloActor2.clear().join();
         assertEquals(0, count(IHelloActor.class));
     }