Fixed crash on OS X with omniORB.

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/MathCoreOSMC@4032 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 12, 2009 · fc4c837 · fc4c837
1 parent d3c4037
commit fc4c837
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Compiler/runtime/corbaimpl.cpp b/Compiler/runtime/corbaimpl.cpp
@@ -459,14 +459,18 @@ void* runOrb(void* arg)
 
 #if defined(USE_OMNIORB)
 try {
-  poa->destroy(true,true);
+  if (poa) {
+    poa->destroy(true,true);
+  }
 } catch (CORBA::Exception&) {
   // silently ignore errors here
 }
 #else
   poa->destroy(TRUE,TRUE);
 #endif
-  delete server;
+  if (server) {
+      delete server;
+  }
 #endif // NOMICO  
   return NULL;
 }
@@ -516,7 +520,7 @@ RML_BEGIN_LABEL(Corba__close)
 #ifndef NOMICO	
   try {
 #if defined(USE_OMNIORB)
-    orb->shutdown(false);
+    orb->shutdown(true); // true otherwise we get a crash on Leopard
 #else
     orb->shutdown(FALSE);
 #endif