- Fix for corbaSessionName not being NULL as it is supposed to

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8391 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 29, 2011 · a7a9423 · a7a9423
1 parent 7476b8e
commit a7a9423
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Compiler/runtime/RTOpts_omc.cpp b/Compiler/runtime/RTOpts_omc.cpp
@@ -36,8 +36,6 @@ extern "C" {
 #include "rtoptsimpl.c"
 
 extern int showErrorMessages;
-extern const char* corbaSessionName;
-
 
 extern int RTOpts_debugFlag(const char* flag) {
   return check_debug_flag(flag)!=0;

diff --git a/Compiler/runtime/rtoptsimpl.c b/Compiler/runtime/rtoptsimpl.c
@@ -98,8 +98,9 @@ int evaluateParametersInAnnotations = 0;
  * @date 2007-02-08
  * This variable is defined in corbaimpl.cpp and set
  * here by function setCorbaSessionName(char* name);
+ * Note: This has to be NULL in order to work properly
  */
-const char* corbaSessionName = "";
+char* corbaSessionName = 0;
 
 /*
  * adrpo 2008-11-28
@@ -368,7 +369,11 @@ int setCorbaSessionName(const char *name)
   if (len==0) return -1;
   if (0 == strcmp("mdt",name)) /* There is no MDT release that enables MetaModelica grammar */
     RTOpts_acceptedGrammar = GRAMMAR_METAMODELICA;
-  corbaSessionName = strdup(name);
+  if (corbaSessionName) free(corbaSessionName);
+  if (*name)
+    corbaSessionName = strdup(name);
+  else
+    corbaSessionName = NULL;
   return 0;
 }