[jbpm-commits] JBoss JBPM SVN: r6191 - in jbpm3/branches/jbpm-3.2-soa/modules: core/src/main/java/org/jbpm/instantiation and 1 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-02-22 19:10:51 -0500 (Mon, 22 Feb 2010)
New Revision: 6191

Modified:
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/TokenVariableMap.java
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/instantiation/SharedProcessClassLoaderFactory.java
   jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationModel.java
Log:
review uses of System.identityHashCode

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/TokenVariableMap.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/TokenVariableMap.java	2010-02-22 21:49:10 UTC (rev 6190)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/TokenVariableMap.java	2010-02-23 00:10:51 UTC (rev 6191)
@@ -27,18 +27,18 @@
 import org.jbpm.graph.exe.Token;
 
 /**
- * is a jbpm-internal map of variableInstances related to one {@link Token}.  
- * Each token has it's own map of variableInstances, thereby creating 
- * hierarchy and scoping of process variableInstances. 
+ * is a jbpm-internal map of variableInstances related to one {@link Token}.
+ * Each token has it's own map of variableInstances, thereby creating hierarchy
+ * and scoping of process variableInstances.
  */
 public class TokenVariableMap extends VariableContainer implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
-  long id = 0;
-  int version = 0;
-  protected Token token = null;
-  protected ContextInstance contextInstance = null;
+  long id;
+  int version;
+  protected Token token;
+  protected ContextInstance contextInstance;
 
   public TokenVariableMap() {
   }
@@ -47,37 +47,35 @@
     this.token = token;
     this.contextInstance = contextInstance;
   }
-  
+
   public void addVariableInstance(VariableInstance variableInstance) {
     super.addVariableInstance(variableInstance);
     variableInstance.setTokenVariableMap(this);
   }
-  
+
   public String toString() {
-    return "TokenVariableMap"+( (token!=null) ? "["+token.getFullName()+"]" : "@" + Integer.toHexString(System.identityHashCode(this)));
+    return "TokenVariableMap" + (token != null ? '(' + token.getName() + ')'
+      : '@' + Integer.toHexString(hashCode()));
   }
 
   // protected ////////////////////////////////////////////////////////////////
 
   protected VariableContainer getParentVariableContainer() {
     Token parentToken = token.getParent();
-    if (parentToken==null) {
-      return null;
-    }
-    return contextInstance.getTokenVariableMap(parentToken);
+    return parentToken != null ? contextInstance.getTokenVariableMap(parentToken) : null;
   }
-  
+
   // getters and setters //////////////////////////////////////////////////////
-  
+
   public ContextInstance getContextInstance() {
     return contextInstance;
   }
+
   public Token getToken() {
     return token;
   }
+
   public Map getVariableInstances() {
     return variableInstances;
   }
-
-  // private static final Log log = LogFactory.getLog(TokenVariableMap.class);
 }

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/instantiation/SharedProcessClassLoaderFactory.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/instantiation/SharedProcessClassLoaderFactory.java	2010-02-22 21:49:10 UTC (rev 6190)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/instantiation/SharedProcessClassLoaderFactory.java	2010-02-23 00:10:51 UTC (rev 6191)
@@ -47,7 +47,7 @@
     // determine the key to lookup a cached class loader
     // observe that the given process definition may be transient
     long id = processDefinition.getId();
-    if (id == 0L) id = processDefinition.hashCode();
+    if (id == 0L) id = System.identityHashCode(processDefinition);
     Long key = new Long(id);
     // consider that the context class loader changes among applications
     ClassLoader parentClassLoader = ClassLoaderUtil.getClassLoader();

Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationModel.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationModel.java	2010-02-22 21:49:10 UTC (rev 6190)
+++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationModel.java	2010-02-23 00:10:51 UTC (rev 6191)
@@ -399,8 +399,7 @@
   }
   
   public String formatTaskInstance(TaskInstance taskInstance) {
-    return taskInstance.toString() + "["
-        + System.identityHashCode(taskInstance) + "]";
+    return taskInstance.toString();
   }
   
   public ResourceRequirement[] getResourceRequirements(Object processElement) {