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 18:50:41 UTC
svn commit: r475327 -
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java
Author: dblevins
Date: Wed Nov 15 09:50:41 2006
New Revision: 475327
URL: http://svn.apache.org/viewvc?view=rev&rev=475327
Log:
Yanking the reset map logic (revision 443703)
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java?view=diff&rev=475327&r1=475326&r2=475327
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java Wed Nov 15 09:50:41 2006
@@ -139,8 +139,6 @@
private final Hashtable syncWrappers = new Hashtable();
- private HashMap resetMap;
-
private TransactionManager transactionManager;
private SecurityService securityService;
private JDOManager localJdoManager;
@@ -255,8 +253,6 @@
e.printStackTrace();
throw new OpenEJBException("Unable to construct the Castor JDOManager objects: "+e.getClass().getName()+": "+e.getMessage(), e);
}
-
- buildResetMap();
}
public static class JoinedClassLoader extends ClassLoader {
@@ -410,7 +406,7 @@
}
} else {
- resetBeanFields(bean, deploymentInfo);
+ // TODO: Set all the cmp fields to the initial values
}
txReadyPoolMap.put(bean, methodReadyPool);
@@ -1059,23 +1055,6 @@
}
}
- protected void resetBeanFields(java.lang.Object bean, org.apache.openejb.core.CoreDeploymentInfo info) {
- final String[] cmFields = info.getCmrFields();
- final Class beanClass = bean.getClass();
-
- try {
- for (int i = 0; i < cmFields.length; i++) {
- Field field = beanClass.getDeclaredField(cmFields[i]);
- Object value = resetMap.get(field.getType());
-// System.out.println("Setting field "+cmFields[i]+" to "+value);
- field.set(bean, value);
- }
- } catch (Exception e) {
-
- logger.error("Internal inconsistency accessing the fields of a CMP entity bean" + bean + ":" + e);
- }
- }
-
public Object newInstance(String className, ClassLoader loader) {
Object obj = null;
@@ -1201,18 +1180,6 @@
*/
public Class loaded(Object loaded, AccessMode mode) throws Exception {
return loaded(loaded, mode.getId());
- }
-
- private void buildResetMap() {
- resetMap = new HashMap();
- resetMap.put(byte.class, new Byte((byte) 0));
- resetMap.put(boolean.class, new Boolean(false));
- resetMap.put(char.class, new Character((char) 0));
- resetMap.put(short.class, new Short((short) 0));
- resetMap.put(int.class, new Integer(0));
- resetMap.put(long.class, new Long(0));
- resetMap.put(float.class, new Float(0));
- resetMap.put(double.class, new Double(0.0));
}
/**