You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2006/11/15 19:24:15 UTC
svn commit: r475345 -
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java
Author: dblevins
Date: Wed Nov 15 10:24:14 2006
New Revision: 475345
URL: http://svn.apache.org/viewvc?view=rev&rev=475345
Log:
Reverted to the old proxy registration code prior to revision 444043
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java?view=diff&rev=475345&r1=475344&r2=475345
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/EntityEjbObjectHandler.java Wed Nov 15 10:24:14 2006
@@ -26,38 +26,6 @@
public class EntityEjbObjectHandler extends EjbObjectProxyHandler {
- private final static class RegistryEntry {
- final Object primaryKey;
- final Object deploymentId;
- final Object containerId;
-
- RegistryEntry(Object primaryKey, Object deploymentId, Object containerId) {
- if (primaryKey == null || deploymentId == null || containerId == null) {
- throw new IllegalArgumentException();
- }
- this.primaryKey = primaryKey;
- this.deploymentId = deploymentId;
- this.containerId = containerId;
- }
-
- public boolean equals(Object other) {
- if (other == this) {
- return true;
- }
- if (other instanceof RegistryEntry) {
- RegistryEntry otherEntry = (RegistryEntry) other;
- return primaryKey.equals(otherEntry.primaryKey) &&
- deploymentId.equals(otherEntry.deploymentId) &&
- containerId.equals(otherEntry.containerId);
- }
- return false;
- }
-
- public int hashCode() {
- return primaryKey.hashCode();
- }
- }
-
/*
* The registryId is a logical identifier that is used as a key when placing EntityEjbObjectHandler into
* the BaseEjbProxyHanlder's liveHandleRegistry. EntityEjbObjectHandlers that represent the same
@@ -81,7 +49,7 @@
* is called.
*/
public static Object getRegistryId(Object primKey, Object deployId, Container contnr) {
- return new RegistryEntry(primKey, deployId, contnr.getContainerID());
+ return "" + primKey + deployId + contnr.getContainerID();
}
public Object getRegistryId() {