Changeset 9269 for trunk

Timestamp:

01/26/09 11:05:51 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MParEnv.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MParEnv.cc

@@ -150 +150 @@
 // the result must inherit from fClassName.
 //
+// After successfull creation of the new class (or if a class was set already
+// before and not overwritten in the resource file) the container's ReadEnv
+// is called.
+//
 // WARNING: Especially in the second case oyu can do weird thing which
 //          in principle can result in crashes. Please be extra-carefull.
@@ -178 +182 @@
     }
 
-    if (!rc)
+    if (!rc && !fCont) // FIXME: fAllowEmpty
         return kFALSE;
 
-    SetCont(cont);
-    if (!fCont)
-    {
-        if (cont)
-            delete cont;
+    if (rc)
+    {
+        SetCont(cont);
+        if (!fCont)
+        {
+            if (cont)
+                delete cont;
+            return kERROR;
+        }
+        fIsOwner = kTRUE;
+    }
+
+    const Int_t res = fCont->ReadEnv(env, prefix, print);
+    if (res==kERROR)
         return kERROR;
-    }
-    fIsOwner = kTRUE;
-    return kTRUE;
-}
+
+    return rc ? rc : res;
+}