dain 2005/02/14 22:24:01
Modified: modules/core/src/java/org/openejb
AbstractInstanceContext.java EJBContextImpl.java
Log:
o Finished GERONIMO-181 Transaction propogation accross calls to stateful
session beans
o Added code resume and suspend the BMT transaction to
StatefulInstanceInterceptor. This code must be here because the instance
context holds the suspended transaction, and this context is not available in
the transaction interceptor. Also the code that "finds" the correct instance
relies on the transaction context already being established
o Enabled stateful tests for session synchronization callbacks
o Session synchronization callbacks now go through the system interceptor
chain
o Container policies now setRollbackOnly and throw a
TransactionRolledbac[Local]Exception when a system exception is thrown in an
inherited transaction
o Fixed GERONIMO-579 UserTransaction broken after BMT calls BMT
o Added support for ejb-ql back into the openejb-jar.xml file so 1.1 beans
can use ejb-ql for a query specification
o Fixed client side handle serialization code
o Fixed stateful session ejb object isIdentical code; was not comparing
primary key
o Fixed handling of remove methods
Revision Changes Path
1.8 +3 -3
openejb/modules/core/src/java/org/openejb/AbstractInstanceContext.java
Index: AbstractInstanceContext.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/AbstractInstanceContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractInstanceContext.java 14 Feb 2005 18:32:12 -0000 1.7
+++ AbstractInstanceContext.java 15 Feb 2005 03:24:01 -0000 1.8
@@ -81,10 +81,10 @@
public void flush() throws Throwable {
}
- public void beforeCommit() throws Exception {
+ public void beforeCommit() throws Throwable {
}
- public void afterCommit(boolean status) throws Exception {
+ public void afterCommit(boolean status) throws Throwable {
}
public Map getConnectionManagerMap() {
1.7 +5 -13
openejb/modules/core/src/java/org/openejb/EJBContextImpl.java
Index: EJBContextImpl.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/EJBContextImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EJBContextImpl.java 13 Feb 2005 23:43:18 -0000 1.6
+++ EJBContextImpl.java 15 Feb 2005 03:24:01 -0000 1.7
@@ -149,9 +149,7 @@
public EJBHome getEJBHome(EJBInstanceContext context) {
if( context.getProxyFactory() !=null ) {
EJBHome home = context.getProxyFactory().getEJBHome();
- if (home != null) {
- return home;
- }
+ return home;
}
throw new IllegalStateException("getEJBHome is not allowed if no
home interface is defined");
}
@@ -159,9 +157,7 @@
public EJBLocalHome getEJBLocalHome(EJBInstanceContext context) {
if( context.getProxyFactory() !=null ) {
EJBLocalHome localHome =
context.getProxyFactory().getEJBLocalHome();
- if (localHome != null) {
- return localHome;
- }
+ return localHome;
}
throw new IllegalStateException("getEJBLocalHome is not allowed
if no local localHome interface is defined");
}
@@ -169,9 +165,7 @@
public EJBObject getEJBObject(EJBInstanceContext context) {
if( context.getProxyFactory() !=null ) {
EJBObject remote =
context.getProxyFactory().getEJBObject(context.getId());
- if (remote != null) {
- return remote;
- }
+ return remote;
}
throw new IllegalStateException("getEJBObject is not allowed if
no remote interface is defined");
}
@@ -179,9 +173,7 @@
public EJBLocalObject getEJBLocalObject(EJBInstanceContext context) {
if( context.getProxyFactory() !=null ) {
EJBLocalObject local =
context.getProxyFactory().getEJBLocalObject(context.getId());
- if (local != null) {
- return local;
- }
+ return local;
}
throw new IllegalStateException("getEJBLocalObject is not
allowed if no local interface is defined");
}
