User: osh
Date: 01/01/27 15:41:43
Modified: src/main/org/jboss/test/cts/ejb StatefulSessionBean.java
StatelessSessionBean.java
Log:
Resolved commit conflict, so that jbosstest compiles again.
Revision Changes Path
1.10 +2 -11
jbosstest/src/main/org/jboss/test/cts/ejb/StatefulSessionBean.java
Index: StatefulSessionBean.java
===================================================================
RCS file:
/products/cvs/ejboss/jbosstest/src/main/org/jboss/test/cts/ejb/StatefulSessionBean.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StatefulSessionBean.java 2001/01/25 02:45:33 1.9
+++ StatefulSessionBean.java 2001/01/27 23:41:41 1.10
@@ -15,8 +15,8 @@
/**
*
* @see <related>
- * @author $Author: peter $
- * @version $Revision: 1.9 $
+ * @author $Author: osh $
+ * @version $Revision: 1.10 $
*/
public class StatefulSessionBean
@@ -197,14 +197,6 @@
{
try
{
-<<<<<<< StatefulSessionBean.java
- Context ctx = new InitialContext();
- StatefulSessionHome home =
- ( StatefulSessionHome ) ctx.lookup("ejbcts/StatefulSessionBean");
- StatefulSession sessionBean = home.create();
-
- sessionBean.loopbackTest(sessionCtx.getEJBObject());
-=======
Context ctx = new InitialContext();
StatefulSessionHome home =
( StatefulSessionHome ) ctx.lookup("ejbcts/StatefulSessionBean");
@@ -216,7 +208,6 @@
throw new EJBException(ex);
}
sessionBean.loopbackTest(sessionCtx.getEJBObject());
->>>>>>> 1.8
}
catch (javax.naming.NamingException nex)
{
1.5 +0 -10
jbosstest/src/main/org/jboss/test/cts/ejb/StatelessSessionBean.java
Index: StatelessSessionBean.java
===================================================================
RCS file:
/products/cvs/ejboss/jbosstest/src/main/org/jboss/test/cts/ejb/StatelessSessionBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StatelessSessionBean.java 2001/01/25 02:45:34 1.4
+++ StatelessSessionBean.java 2001/01/27 23:41:41 1.5
@@ -70,15 +70,6 @@
{
try
{
-<<<<<<< StatelessSessionBean.java
- Context ctx = new InitialContext();
- StatelessSessionHome home =
- ( StatelessSessionHome ) ctx.lookup(
- "ejbcts/StatelessSessionBean");
- StatelessSession sessionBean = home.create();
-
- sessionBean.loopbackTest(sessionCtx.getEJBObject());
-=======
Context ctx = new InitialContext();
StatelessSessionHome home =
( StatelessSessionHome ) ctx.lookup("ejbcts/StatelessSessionBean");
@@ -90,7 +81,6 @@
throw new EJBException(ex);
}
sessionBean.loopbackTest(sessionCtx.getEJBObject());
->>>>>>> 1.3
}
catch (javax.naming.NamingException nex)
{
