From c0be5c00b3d9399725fbdb010ad5868e5bbfee5e Mon Sep 17 00:00:00 2001
From: Faker Moatamri <faker.moatamri@sophia.inria.fr>
Date: Tue, 19 Jan 2010 17:02:38 +0100
Subject: [PATCH] Bug 793: no creation of a new simulator when calling
 simulator::cancel or remove or IsExpired

---
 src/simulator/simulator.cc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/simulator/simulator.cc b/src/simulator/simulator.cc
index 3a51d6f41..e3ef14898 100644
--- a/src/simulator/simulator.cc
+++ b/src/simulator/simulator.cc
@@ -291,6 +291,10 @@ void
 Simulator::Remove (const EventId &ev)
 {
   NS_LOG_FUNCTION (&ev);
+  if (*PeekImpl () == 0)
+    {
+      return;
+    }
   return GetImpl ()->Remove (ev);
 }
 
@@ -298,6 +302,10 @@ void
 Simulator::Cancel (const EventId &ev)
 {
   NS_LOG_FUNCTION (&ev);
+  if (*PeekImpl () == 0)
+    {
+      return;
+    }
   return GetImpl ()->Cancel (ev);
 }
 
@@ -305,6 +313,10 @@ bool
 Simulator::IsExpired (const EventId &id)
 {
   NS_LOG_FUNCTION (&id);
+  if (*PeekImpl () == 0)
+    {
+      return true;
+    }
   return GetImpl ()->IsExpired (id);
 }