[jboss-cvs] JBossAS SVN: r62532 - trunk/testsuite/src/main/org/jboss/test/web/servlets.

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

Author: anil.saldhana at jboss.com
Date: 2007-04-25 00:23:31 -0400 (Wed, 25 Apr 2007)
New Revision: 62532

Modified:
   trunk/testsuite/src/main/org/jboss/test/web/servlets/EntityServlet.java
Log:
remove any residue from previous test runs

Modified: trunk/testsuite/src/main/org/jboss/test/web/servlets/EntityServlet.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/servlets/EntityServlet.java	2007-04-25 03:36:49 UTC (rev 62531)
+++ trunk/testsuite/src/main/org/jboss/test/web/servlets/EntityServlet.java	2007-04-25 04:23:31 UTC (rev 62532)
@@ -24,9 +24,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.ServletConfig;
+import javax.naming.InitialContext; 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -34,6 +32,7 @@
 
 import org.jboss.test.web.interfaces.Entity;
 import org.jboss.test.web.interfaces.EntityHome;
+import org.jboss.test.web.interfaces.EntityPK;
 import org.jboss.test.web.util.Util;
 
 /** A servlet that accesses an entity EJB 
@@ -51,6 +50,19 @@
             InitialContext ctx = new InitialContext();
             Context enc = (Context) ctx.lookup("java:comp/env");
             EntityHome home = (EntityHome) enc.lookup("ejb/Entity");
+            try
+            { 
+               //Remove old entity beans from previous test runs
+               Entity existing = home.findByPrimaryKey(new EntityPK(12345));
+               if(existing != null)
+               {
+                  existing.remove();
+               } 
+            }
+            catch(Exception e)
+            {
+               //ignore
+            }
             Entity bean = home.create(12345, 6789);
             bean.write(7890);
             bean.read();