CoreObject enhancement so that it does not crash if the giver/receiver can be none

ceea38d2 · Georgios Dagkakis · Jérome Perrin · d26bf50e · ceea38d2
Commit ceea38d2 authored Dec 17, 2013 by Georgios Dagkakis Committed by Jérome Perrin Jan 20, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

dream/simulation/CoreObject.py dream/simulation/CoreObject.py +2 -2

No files found.
--- a/dream/simulation/CoreObject.py
+++ b/dream/simulation/CoreObject.py
@@ -203,7 +203,7 @@ class CoreObject(Process):
    
    # =================== get the giver object in a getEntity transaction. =========================        
    def getGiverObject(self):
-        return self.giver.getActiveObject()
+        return self.giver

    
    # ============== get the giver object queue in a getEntity transaction. ========================    
@@ -212,7 +212,7 @@ class CoreObject(Process):
    
    # ============== get the receiver object in a removeEntity transaction.  ======================= 
    def getReceiverObject(self):
-        return self.receiver.getActiveObject()
+        return self.receiver
    
    # ========== get the receiver object queue in a removeEntity transaction. ======================    
    def getReceiverObjectQueue(self):