[jboss-cvs] JBossAS SVN: r61093 - trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-03-05 15:08:24 -0500 (Mon, 05 Mar 2007)
New Revision: 61093

Modified:
   trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java
Log:
Tighten cleanup operations

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java	2007-03-05 20:07:16 UTC (rev 61092)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/embeddedid/EmbeddedIdTestBean.java	2007-03-05 20:08:24 UTC (rev 61093)
@@ -25,6 +25,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javax.annotation.PreDestroy;
 import javax.ejb.Remote;
 import javax.ejb.Remove;
 import javax.ejb.Stateful;
@@ -80,30 +81,43 @@
     */
    public void cleanup()
    {
-      Query query = manager.createQuery("select musician from Musician as musician");
-      List accts = query.getResultList();
-      if (accts != null)
+      internalCleanup();
+   }
+   
+   private void internalCleanup()
+   {
+      if (manager != null)
       {
-         for (Iterator it = accts.iterator(); it.hasNext();)
+         Query query = manager.createQuery("select musician from Musician as musician");
+         List accts = query.getResultList();
+         if (accts != null)
          {
-            try
+            for (Iterator it = accts.iterator(); it.hasNext();)
             {
-               Musician musician = (Musician) it.next();
-               log.info("Removing " + musician);
-               manager.remove(musician);
+               try
+               {
+                  Musician musician = (Musician) it.next();
+                  log.info("Removing " + musician);
+                  manager.remove(musician);
+               }
+               catch (Exception ignored) {}
             }
-            catch (Exception ignored) {}
          }
       }
    }
 
-   /* (non-Javadoc)
-    * @see org.jboss.ejb3.test.clusteredentity.classloader.UserTest#remove()
-    */
+   @PreDestroy
    @Remove
    public void remove()
    {
-      cleanup();
+      try
+      {
+         internalCleanup();
+      }
+      catch (Exception e)
+      {
+         log.error("Caught exception in remove", e);
+      }
    }
 
 }