Revision: 7992
          http://playerstage.svn.sourceforge.net/playerstage/?rev=7992&view=rev
Author:   hsujohnhsu
Date:     2009-07-11 21:17:44 +0000 (Sat, 11 Jul 2009)

Log Message:
-----------
update World shutdown: remove factory Iface during World::Fini() call before 
Server::Fini() call so to avoid having to rm -rf on /tmp.

Modified Paths:
--------------
    code/gazebo/trunk/server/World.cc

Modified: code/gazebo/trunk/server/World.cc
===================================================================
--- code/gazebo/trunk/server/World.cc   2009-07-11 21:16:15 UTC (rev 7991)
+++ code/gazebo/trunk/server/World.cc   2009-07-11 21:17:44 UTC (rev 7992)
@@ -115,8 +115,10 @@
   }
 
   if (this->factory)
+  {
     delete this->factory;
-  this->factory = NULL;
+    this->factory = NULL;
+  }
 }
 
 
////////////////////////////////////////////////////////////////////////////////
@@ -336,6 +338,18 @@
   { 
     gzmsg(-1) << "Problem destroying simIface[" << e << "]\n";
   }
+  try
+  {
+    if (this->factory)
+    {
+      delete this->factory;
+      this->factory = NULL;
+    }
+  }
+  catch (std::string e)
+  { 
+    gzmsg(-1) << "Problem destroying factory[" << e << "]\n";
+  }
 
   try
   {


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge  
This is your chance to win up to $100,000 in prizes! For a limited time, 
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize  
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit

Reply via email to