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

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

Author: KrisVerlaenen
Date: 2008-06-03 11:55:37 -0400 (Tue, 03 Jun 2008)
New Revision: 20271

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java
Log:


Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java	2008-06-03 14:33:46 UTC (rev 20270)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java	2008-06-03 15:55:37 UTC (rev 20271)
@@ -556,7 +556,11 @@
 
         RuleFlowProcessInstance processInstance = new RuleFlowProcessInstance();
         processInstance.setId( stream.readLong() );
-        processInstance.setProcess( ruleBase.getProcess( stream.readUTF() ) );
+        String processId = stream.readUTF();
+        processInstance.setProcessId( processId );
+        if (ruleBase != null) {
+        	processInstance.setProcess( ruleBase.getProcess( processId ) );
+        }
         processInstance.setState( stream.readInt() );
         long nodeInstanceCounter = stream.readLong();
         processInstance.setWorkingMemory( wm );
@@ -582,7 +586,9 @@
         }
 
         processInstance.internalSetNodeInstanceCounter( nodeInstanceCounter );
-        wm.addProcessInstance( processInstance );
+        if (wm != null) {
+        	wm.addProcessInstance( processInstance );
+        }
         return processInstance;
     }
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java	2008-06-03 14:33:46 UTC (rev 20270)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java	2008-06-03 15:55:37 UTC (rev 20271)
@@ -69,6 +69,10 @@
         return this.process;
     }
     
+    public void setProcessId(String processId) {
+    	this.processId = processId;
+    }
+    
     public String getProcessId() {
         return processId;
     }