Changeset 255 for trunk/nom/src/nombuildclass.c

Timestamp:

Mar 15, 2007, 9:42:22 PM (18 years ago)

Author:

cinc

Message:

Parameter checking for object pointer working.

File:

• trunk/nom/src/nombuildclass.c (modified) (6 diffs)

trunk/nom/src/nombuildclass.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2005-2007
 * the Initial Developer. All Rights Reserved.
 *
@@ -969 +969 @@
                                                   ulMajorVersion, ulMinorVersion);
         if(nomClass){
+          CORBA_Environment * tempEnv=nomCreateEnvNoObjectCheck();
+
           DBG_NOMBUILDCLASS(TRUE, "%s: class is 0x%x\n", nomClass->mtab->nomClassName, nomClass);
 #if 0
@@ -977 +979 @@
           priv_checkForNomUnInitOverride( (NOMClassPriv*)nomClass->mtab->nomClsInfo,  ncpParent);
 #endif     
-          _nomInit((NOMObject*)nomClass, NULLHANDLE);
-          _nomClassReady(nomClass, NULLHANDLE);
+          /* Make sure the env is marked that we don't chek the object pointer. This would fail
+             because the class isn't registered yet. */
+          _nomInit((NOMObject*)nomClass, tempEnv);
+          _nomClassReady(nomClass, tempEnv);
         }
 
@@ -993 +997 @@
 
       if(nomClass){
-        _nomInit((NOMObject*)nomClass, NULLHANDLE);
-        _nomClassReady(nomClass, NULLHANDLE);
+        CORBA_Environment * tempEnv=nomCreateEnvNoObjectCheck();
+        /* Make sure the env is marked that we don't chek the object pointer. This would fail
+           because the class isn't registered yet. */
+        _nomInit((NOMObject*)nomClass, tempEnv);
+        _nomClassReady(nomClass, tempEnv);
       }
       return nomClass;
@@ -1088 +1095 @@
 
   if(nomClass){
+    CORBA_Environment * tempEnv=nomCreateEnvNoObjectCheck();
+
     /* Mark the class as using nomUnInit() if any parent did that. We just have to
        check the flag and the flag of the parent class. This information is important
@@ -1094 +1103 @@
     priv_checkForNomUnInitOverride( (NOMClassPriv*)nomClass->mtab->nomClsInfo,  ncpParent);
     
-    _nomInit(nomClass, NULLHANDLE);
-    _nomClassReady(nomClass, NULLHANDLE);
+    /* Make sure the env is marked that we don't chek the object pointer. This would fail
+       because the class isn't registered yet. */
+    _nomInit(nomClass, tempEnv);
+    _nomClassReady(nomClass, tempEnv);
   }
   return nomClass;