[jboss-svn-commits] JBL Code SVN: r36501 - labs/jbossrules/soa_branches/BRMS-5.1.x/drools-core/src/main/java/org/drools/process/core/impl.

[jboss-svn-commits at lists.jboss.org]

Author: tsurdilovic
Date: 2011-01-05 15:58:58 -0500 (Wed, 05 Jan 2011)
New Revision: 36501

Modified:
   labs/jbossrules/soa_branches/BRMS-5.1.x/drools-core/src/main/java/org/drools/process/core/impl/ProcessImpl.java
Log:
BRMS-527 : ResourceChangeScanner causes NPE for a rule flow without 'version' attribute

Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-core/src/main/java/org/drools/process/core/impl/ProcessImpl.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-core/src/main/java/org/drools/process/core/impl/ProcessImpl.java	2011-01-05 01:08:04 UTC (rev 36500)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-core/src/main/java/org/drools/process/core/impl/ProcessImpl.java	2011-01-05 20:58:58 UTC (rev 36501)
@@ -129,17 +129,22 @@
         return this.contextContainer.getDefaultContext(contextType);
     }
 
-    public boolean equals(final Object o) {
-        if ( o instanceof ProcessImpl ) {
-            return ((ProcessImpl) o).getName().equals( this.name ) && ((ProcessImpl) o).getVersion().equals( this.version );
-        }
-        return false;
-    }
+    public boolean equals(final Object o) {
+        if ( o instanceof ProcessImpl ) {
+            if (this.id != null) {
+                return ((ProcessImpl) o).getId() == null;
+            }
+            return this.id.equals(((ProcessImpl) o).getId());
+        }
+        return false;
+    }
 
-    public int hashCode() {
-        return this.name.hashCode() + (this.version == null ? 0 : 3 * this.version.hashCode());
-    }
 
+    public int hashCode() {
+        return this.id == null ? 0 : 3 * this.id.hashCode();
+    }
+
+
     public Context resolveContext(String contextId, Object param) {
         Context context = getDefaultContext(contextId);
         if (context != null) {