Changeset 10543 for code/branches/core7/src/libraries/core/object

Timestamp:

Jun 7, 2015, 2:50:04 PM (9 years ago)

Author:

landauf

Message:

create and destroy root-context in a controlled manner

File:

• code/branches/core7/src/libraries/core/object/Context.cc (modified) (2 diffs)

code/branches/core7/src/libraries/core/object/Context.cc

@@ -76 +76 @@
     /*static*/ void Context::setRootContext(Context* context)
     {
-        if (Context::rootContext_s)
-            delete Context::rootContext_s;
         Context::rootContext_s = context;
     }
@@ -83 +81 @@
     /*static*/ Context* Context::getRootContext()
     {
-        if (!Context::rootContext_s)
-            Context::rootContext_s = new Context(NULL);
+        OrxVerify(Context::rootContext_s != NULL, "Root Context is undefined");
         return Context::rootContext_s;
     }