Repository: tomee Updated Branches: refs/heads/tomee-1.7.x c1f8b3876 -> d68ba480d
Overrides Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f422b23d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f422b23d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f422b23d Branch: refs/heads/tomee-1.7.x Commit: f422b23df44d1f6e0caae998797067a4f4afa472 Parents: c1f8b38 Author: AndyGee <[email protected]> Authored: Fri Feb 19 16:23:55 2016 +0100 Committer: AndyGee <[email protected]> Committed: Fri Feb 19 16:23:55 2016 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/core/entity/EntityEjbHomeHandler.java | 8 ++++++-- .../apache/openejb/core/entity/EntityEjbObjectHandler.java | 5 +++++ .../apache/openejb/core/managed/ManagedObjectHandler.java | 4 ++++ .../openejb/core/stateful/StatefulEjbObjectHandler.java | 4 ++++ 4 files changed, 19 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/f422b23d/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java index 62daa13..e18b8ae 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbHomeHandler.java @@ -43,6 +43,7 @@ public class EntityEjbHomeHandler extends EjbHomeProxyHandler { super(beanContext, interfaceType, interfaces, mainInterface); } + @Override public Object createProxy(final Object primaryKey, final Class mainInterface) { final Object proxy = super.createProxy(primaryKey, mainInterface); final EjbObjectProxyHandler handler = (EjbObjectProxyHandler) ProxyManager.getInvocationHandler(proxy); @@ -59,6 +60,7 @@ public class EntityEjbHomeHandler extends EjbHomeProxyHandler { } + @Override protected Object findX(final Class interfce, final Method method, final Object[] args, final Object proxy) throws Throwable { final Object retValue; try { @@ -71,8 +73,8 @@ public class EntityEjbHomeHandler extends EjbHomeProxyHandler { if (retValue instanceof Collection) { final Object[] proxyInfos = ((Collection) retValue).toArray(); final Vector proxies = new Vector(); - for (int i = 0; i < proxyInfos.length; i++) { - final ProxyInfo proxyInfo = (ProxyInfo) proxyInfos[i]; + for (final Object o : proxyInfos) { + final ProxyInfo proxyInfo = (ProxyInfo) o; proxies.addElement(createProxy(proxyInfo.getPrimaryKey(), getMainInterface())); } return proxies; @@ -101,6 +103,7 @@ public class EntityEjbHomeHandler extends EjbHomeProxyHandler { } + @Override protected Object removeByPrimaryKey(final Class interfce, final Method method, final Object[] args, final Object proxy) throws Throwable { final Object primKey = args[0]; @@ -152,6 +155,7 @@ public class EntityEjbHomeHandler extends EjbHomeProxyHandler { return sb.toString(); } + @Override protected EjbObjectProxyHandler newEjbObjectHandler(final BeanContext beanContext, final Object pk, final InterfaceType interfaceType, final List<Class> interfaces, final Class mainInterface) { return new EntityEjbObjectHandler(getBeanContext(), pk, interfaceType, interfaces, mainInterface); } http://git-wip-us.apache.org/repos/asf/tomee/blob/f422b23d/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java index 2252550..5c0c08e 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java @@ -55,6 +55,7 @@ public class EntityEjbObjectHandler extends EjbObjectProxyHandler { return new RegistryId(container, deploymentId, primaryKey); } + @Override public Object getRegistryId() { if (registryId == null) { registryId = getRegistryId(container, deploymentID, primaryKey); @@ -62,10 +63,12 @@ public class EntityEjbObjectHandler extends EjbObjectProxyHandler { return registryId; } + @Override protected Object getPrimaryKey(final Method method, final Object[] args, final Object proxy) throws Throwable { return primaryKey; } + @Override protected Object isIdentical(final Method method, final Object[] args, final Object proxy) throws Throwable { checkAuthorization(method); @@ -89,6 +92,7 @@ public class EntityEjbObjectHandler extends EjbObjectProxyHandler { return false; } + @Override protected Object remove(final Class interfce, final Method method, final Object[] args, final Object proxy) throws Throwable { checkAuthorization(method); final Object value = container.invoke(deploymentID, interfaceType, interfce, method, args, primaryKey); @@ -100,6 +104,7 @@ public class EntityEjbObjectHandler extends EjbObjectProxyHandler { return value; } + @Override public void invalidateReference() { // entity bean object references should not be invalidated since they // will automatically hook up to a new instance of the bean using the http://git-wip-us.apache.org/repos/asf/tomee/blob/f422b23d/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java index d3b565c..5a0b8bf 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/managed/ManagedObjectHandler.java @@ -34,14 +34,17 @@ public class ManagedObjectHandler extends EjbObjectProxyHandler { super(beanContext, pk, interfaceType, interfaces, mainInterface); } + @Override public Object getRegistryId() { return new RegistryId(container, deploymentID, primaryKey); } + @Override protected Object getPrimaryKey(final Method method, final Object[] args, final Object proxy) throws Throwable { throw new RemoteException("Session objects are private resources and do not have primary keys"); } + @Override protected Object isIdentical(final Method method, final Object[] args, final Object proxy) throws Throwable { checkAuthorization(method); @@ -66,6 +69,7 @@ public class ManagedObjectHandler extends EjbObjectProxyHandler { return false; } + @Override protected Object remove(final Class interfce, final Method method, final Object[] args, final Object proxy) throws Throwable { checkAuthorization(method); final Object value = container.invoke(deploymentID, interfaceType, interfce, method, args, primaryKey); http://git-wip-us.apache.org/repos/asf/tomee/blob/f422b23d/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java index 17ab9f3..e7a6094 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java @@ -34,14 +34,17 @@ public class StatefulEjbObjectHandler extends EjbObjectProxyHandler { super(beanContext, pk, interfaceType, interfaces, mainInterface); } + @Override public Object getRegistryId() { return new RegistryId(container, deploymentID, primaryKey); } + @Override protected Object getPrimaryKey(final Method method, final Object[] args, final Object proxy) throws Throwable { throw new RemoteException("Session objects are private resources and do not have primary keys"); } + @Override protected Object isIdentical(final Method method, final Object[] args, final Object proxy) throws Throwable { checkAuthorization(method); @@ -66,6 +69,7 @@ public class StatefulEjbObjectHandler extends EjbObjectProxyHandler { return false; } + @Override protected Object remove(final Class interfce, final Method method, final Object[] args, final Object proxy) throws Throwable { checkAuthorization(method); final Object value = container.invoke(deploymentID, interfaceType, interfce, method, args, primaryKey);
