djencks 2004/10/05 03:04:00
Modified: modules/core/src/java/org/openejb/entity/bmp
BMPInstanceContext.java
BMPInstanceContextFactory.java
Log:
Use TransactionContextManager rather than TransactionContext static methods. Mostly
fix GERONIMO-355. Progress on GERONIMO-347. This demonstrates the problems in
GERONIMO-359 and GERONIMO-360 (there are now itest failures)
Revision Changes Path
1.8 +4 -3
openejb/modules/core/src/java/org/openejb/entity/bmp/BMPInstanceContext.java
Index: BMPInstanceContext.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/bmp/BMPInstanceContext.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BMPInstanceContext.java 20 Jul 2004 23:40:02 -0000 1.7
+++ BMPInstanceContext.java 5 Oct 2004 07:04:00 -0000 1.8
@@ -52,6 +52,7 @@
import javax.ejb.EntityBean;
import org.apache.geronimo.core.service.Interceptor;
+import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.openejb.dispatch.SystemMethodIndices;
import org.openejb.entity.EntityInstanceContext;
import org.openejb.proxy.EJBProxyFactory;
@@ -64,8 +65,8 @@
*/
public final class BMPInstanceContext extends EntityInstanceContext {
- public BMPInstanceContext(Object containerId, EJBProxyFactory proxyFactory,
EntityBean instance, Interceptor lifecycleInterceptorChain, SystemMethodIndices
systemMethodIndices, Set unshareableResources, Set
applicationManagedSecurityResources, BasicTimerService timerService) throws Exception {
- super(containerId, proxyFactory, instance, lifecycleInterceptorChain,
systemMethodIndices, unshareableResources, applicationManagedSecurityResources,
timerService);
+ public BMPInstanceContext(Object containerId, EJBProxyFactory proxyFactory,
EntityBean instance, Interceptor lifecycleInterceptorChain, SystemMethodIndices
systemMethodIndices, Set unshareableResources, Set
applicationManagedSecurityResources, TransactionContextManager
transactionContextManager, BasicTimerService timerService) throws Exception {
+ super(containerId, proxyFactory, instance, lifecycleInterceptorChain,
systemMethodIndices, unshareableResources, applicationManagedSecurityResources,
transactionContextManager, timerService);
}
}
1.10 +9 -3
openejb/modules/core/src/java/org/openejb/entity/bmp/BMPInstanceContextFactory.java
Index: BMPInstanceContextFactory.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/bmp/BMPInstanceContextFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BMPInstanceContextFactory.java 20 Jul 2004 23:40:02 -0000 1.9
+++ BMPInstanceContextFactory.java 5 Oct 2004 07:04:00 -0000 1.10
@@ -55,6 +55,7 @@
import org.apache.geronimo.core.service.Interceptor;
import org.apache.geronimo.transaction.InstanceContext;
+import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.openejb.EJBInstanceFactory;
import org.openejb.EJBInstanceFactoryImpl;
import org.openejb.InstanceContextFactory;
@@ -76,7 +77,8 @@
private transient EJBProxyFactory proxyFactory;
private transient Interceptor systemChain;
private transient SystemMethodIndices systemMethodIndices;
- private BasicTimerService timerService;
+ private transient TransactionContextManager transactionContextManager;
+ private transient BasicTimerService timerService;
public BMPInstanceContextFactory(Object containerId, Class beanClass, Set
unshareableResources, Set applicationManagedSecurityResources) {
@@ -99,6 +101,10 @@
return systemMethodIndices;
}
+ public void setTransactionContextManager(TransactionContextManager
transactionContextManager) {
+ this.transactionContextManager = transactionContextManager;
+ }
+
public void setTimerService(BasicTimerService timerService) {
this.timerService = timerService;
}
@@ -107,6 +113,6 @@
if (proxyFactory == null) {
throw new IllegalStateException("ProxyFactory has not been set");
}
- return new BMPInstanceContext(containerId, proxyFactory, (EntityBean)
factory.newInstance(), systemChain, systemMethodIndices, unshareableResources,
applicationManagedSecurityResources, timerService);
+ return new BMPInstanceContext(containerId, proxyFactory, (EntityBean)
factory.newInstance(), systemChain, systemMethodIndices, unshareableResources,
applicationManagedSecurityResources, transactionContextManager, timerService);
}
}
