dblevins 2004/08/26 03:20:26
Modified: modules/core/src/java/org/openejb/core/ivm
BaseEjbProxyHandler.java EjbHomeProxyHandler.java
EjbObjectProxyHandler.java
Log:
Last changes on getting local interface support to work
Revision Changes Path
1.3 +10 -1
openejb1/modules/core/src/java/org/openejb/core/ivm/BaseEjbProxyHandler.java
Index: BaseEjbProxyHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/ivm/BaseEjbProxyHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseEjbProxyHandler.java 14 Aug 2004 10:35:38 -0000 1.2
+++ BaseEjbProxyHandler.java 26 Aug 2004 07:20:26 -0000 1.3
@@ -140,6 +140,7 @@
* property in the static block for this class.
*/
protected boolean doIntraVmCopy;
+ private boolean isLocal;
/**
* Constructs a BaseEjbProxyHandler representing the specifed bean deployment.
@@ -314,6 +315,7 @@
return _invoke(proxy,method,args);
} catch (Throwable t) {
+ t.printStackTrace();
Class[] etypes = method.getExceptionTypes();
for (int i = 0; i < etypes.length; i++) {
if
(t.getClass().isAssignableFrom(etypes[i])){
@@ -456,4 +458,11 @@
public abstract org.openejb.ProxyInfo getProxyInfo();
+ public boolean isLocal() {
+ return isLocal;
+ }
+ public void setLocal(boolean isLocal) {
+ this.isLocal = isLocal;
+ this.doIntraVmCopy = !isLocal;
+ }
}
1.3 +2 -1
openejb1/modules/core/src/java/org/openejb/core/ivm/EjbHomeProxyHandler.java
Index: EjbHomeProxyHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/ivm/EjbHomeProxyHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EjbHomeProxyHandler.java 14 Aug 2004 10:35:38 -0000 1.2
+++ EjbHomeProxyHandler.java 26 Aug 2004 07:20:26 -0000 1.3
@@ -113,6 +113,7 @@
Object newProxy = null;
try {
EjbObjectProxyHandler handler =
newEjbObjectHandler(proxyInfo.getBeanContainer(), proxyInfo.getPrimaryKey(),
proxyInfo.getDeploymentInfo().getDeploymentID());
+ handler.setLocal(isLocal());
handler.doIntraVmCopy = this.doIntraVmCopy;
Class[] interfaces = new Class[]{ proxyInfo.getInterface(),
IntraVmProxy.class };
newProxy = ProxyManager.newProxyInstance( interfaces , handler );
1.2 +2 -2
openejb1/modules/core/src/java/org/openejb/core/ivm/EjbObjectProxyHandler.java
Index: EjbObjectProxyHandler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/ivm/EjbObjectProxyHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EjbObjectProxyHandler.java 26 Mar 2004 21:42:29 -0000 1.1
+++ EjbObjectProxyHandler.java 26 Aug 2004 07:20:26 -0000 1.2
@@ -203,7 +203,7 @@
return new IntraVmHandle(proxy);
}
public org.openejb.ProxyInfo getProxyInfo(){
- return new org.openejb.ProxyInfo(deploymentInfo, primaryKey,
deploymentInfo.getRemoteInterface(), container);
+ return new org.openejb.ProxyInfo(deploymentInfo, primaryKey, isLocal(),
container);
}
/**
