[Jboss-svn-commits] JBL Code SVN: r3742 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/conflict

[<jbo...@li...>]

Author: tirelli
Date: 2006-04-17 12:48:44 -0400 (Mon, 17 Apr 2006)
New Revision: 3742

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/conflict/RecencyConflictResolver.java
Log:
fixing null pointer exception on RecencyConflictResolver

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/conflict/RecencyConflictResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/conflict/RecencyConflictResolver.java	2006-04-17 15:56:15 UTC (rev 3741)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/conflict/RecencyConflictResolver.java	2006-04-17 16:48:44 UTC (rev 3742)
@@ -41,9 +41,7 @@
  *
  */
 
-import org.drools.FactHandle;
 import org.drools.common.InternalFactHandle;
-import org.drools.reteoo.FactHandleImpl;
 import org.drools.spi.Activation;
 import org.drools.spi.ConflictResolver;
 
@@ -111,10 +109,9 @@
                 rightMostRecent = getMostRecentFact( rFacts, rightMostRecent );
                 if ( leftMostRecent == null || rightMostRecent == null ) {
                     if( leftMostRecent == null && rightMostRecent != null ) {
-                        return leftMostRecent.getRecency();
-                    }
-                }
-                if ( leftMostRecent.getRecency() != rightMostRecent.getRecency() ) {
+                        return (int) rightMostRecent.getRecency();
+                    } 
+                } else if ( leftMostRecent.getRecency() != rightMostRecent.getRecency() ) {
                     return (int) ( rightMostRecent.getRecency() - leftMostRecent.getRecency() );
                 }
             }