[jboss-svn-commits] JBL Code SVN: r34248 - in labs/jbossrules/trunk/drools-core/src/main/java/org/drools: marshalling/impl and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2010-07-28 07:15:17 -0400 (Wed, 28 Jul 2010)
New Revision: 34248

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/StandardQueryViewChangedEventListener.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/impl/OutputMarshaller.java
Log:
JBRULES-2601 Remove DisconnectedFactHandle and make DefaultFactHandle capable of being disconnected
-Corrected marshalling mistake

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/StandardQueryViewChangedEventListener.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/StandardQueryViewChangedEventListener.java	2010-07-28 10:50:57 UTC (rev 34247)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/StandardQueryViewChangedEventListener.java	2010-07-28 11:15:17 UTC (rev 34248)
@@ -52,7 +52,7 @@
         while ( entry.getIndex() > 0 ) {
             InternalFactHandle handle = entry.getLastHandle();
             handles[entry.getIndex()] = new DefaultFactHandle( handle.getId(),
-                                                               handle.getEntryPoint().getEntryPointId() ,
+                                                               ( handle.getEntryPoint() != null ) ?  handle.getEntryPoint().getEntryPointId() : null,
                                                                handle.getIdentityHashCode(),
                                                                handle.getObjectHashCode(),
                                                                handle.getRecency(),

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/impl/OutputMarshaller.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/impl/OutputMarshaller.java	2010-07-28 10:50:57 UTC (rev 34247)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/impl/OutputMarshaller.java	2010-07-28 11:15:17 UTC (rev 34248)
@@ -343,7 +343,7 @@
         ObjectOutputStream stream = context.stream;
         InternalRuleBase ruleBase = context.ruleBase;
 
-        ObjectTypeNode initialFactNode = ruleBase.getRete().getEntryPointNode( EntryPoint.DEFAULT ).getObjectTypeNodes().get( new ClassObjectType( InitialFactImpl.class ) );
+        ObjectTypeNode initialFactNode = ruleBase.getRete().getEntryPointNode( EntryPoint.DEFAULT ).getObjectTypeNodes().get( new ClassObjectType( InitialFact.class ) );
 
         // do we write the fact to the objecttypenode memory
         if ( initialFactNode != null ) {