0031769: Application Framework - regression : can not initialize two kinds of applica...

diff --git a/src/TObj/TObj_Application.cxx b/src/TObj/TObj_Application.cxx
index 7e889a4..17bb84e 100644 (file)
--- a/src/TObj/TObj_Application.cxx
+++ b/src/TObj/TObj_Application.cxx
@@ -42,7 +42,17 @@ Handle(TObj_Application) TObj_Application::GetInstance()
   Handle(CDF_Session) aSession = CDF_Session::Create();
   Handle(CDF_Application) anApp;
   if (aSession->FindApplication(OSD_Thread::Current(), anApp))
-    return Handle(TObj_Application)::DownCast(anApp);
+  {
+    Handle(TObj_Application) aTObjApp = Handle(TObj_Application)::DownCast(anApp);
+    if (!aTObjApp.IsNull())
+      return aTObjApp;
+    // If in session application of another type is already registered, use this global
+    // application, alone, outside of the session (as a workaround for DRAW scripting where
+    // many kinds of applications can be required).
+    static Handle(TObj_Application) THE_TOBJ_APP(new TObj_Application);
+    return THE_TOBJ_APP;
+  }
+  // It will register this application in the session.
   return new TObj_Application;
 }
 

diff --git a/tests/bugs/caf/bug31769 b/tests/bugs/caf/bug31769
new file mode 100644 (file)
index 0000000..852526a
--- /dev/null
+++ b/tests/bugs/caf/bug31769
@@ -0,0 +1,6 @@
+puts "==========="
+puts "0031769: Application Framework - regression : can not initialize two kinds of application in one thread"
+puts "==========="
+
+# loading of ALL initializes TDOCStd_Application, loading TOBJ initializes TObj_Application
+pload ALL TOBJ