Changeset 255 for trunk/nom/class_c/nomcls.c

Timestamp:

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

Author:

cinc

Message:

Parameter checking for object pointer working.

File:

• trunk/nom/class_c/nomcls.c (modified) (5 diffs)

trunk/nom/class_c/nomcls.c

@@ -79 +79 @@
   gchar* nObj;
 
-  if(!nomSelf)
-    return NULLHANDLE;
-
   if(!_ncpObject)
     return NULLHANDLE;
@@ -134 +131 @@
                                                     CORBA_Environment *ev)
 {
+#if 0
+  CORBA_Environment tempEnv={0};
+  tempEnv.fFlags=NOMENV_FLG_DONT_CHECK_OBJECT;
+#endif
   _nomRenewNoInit(nomSelf, nomObj, NULLHANDLE);
 
   /* And now give the object the possibility to initialize... */
+  /* Make sure the object is not checked. */
+  //_nomInit((NOMObject*)nomObj, &tempEnv);
   _nomInit((NOMObject*)nomObj, NULLHANDLE);
-  
+
   return nomObj;
 }
@@ -210 +213 @@
 NOM_Scope void NOMLINK impl_NOMClass_nomClassReady(NOMClass* nomSelf, CORBA_Environment *ev)
 {
+  CORBA_Environment tempEnv={0};
+  tempEnv.fFlags=NOMENV_FLG_DONT_CHECK_OBJECT;
 
   nomPrintf("    Entering %s  with nomSelf: 0x%x. nomSelf is: %s.\n",
@@ -231 +236 @@
       //if(!_nomFindClassFromName(NOMClassMgrObject, _nomGetName(nomSelf, NULLHANDLE),
       //                        0, 0, NULLHANDLE))
-      if(!_nomFindClassFromName(NOMClassMgrObject, _nomGetClassName(nomSelf, NULLHANDLE),
-                              0, 0, NULLHANDLE))
+      if(!_nomFindClassFromName(NOMClassMgrObject, _nomGetClassName(nomSelf, &tempEnv),
+                              0, 0, &tempEnv))
 
         {
@@ -305 +310 @@
 {
 /* NOMClassData* nomThis=NOMClassGetData(nomSelf); */
-
-  //nomPrintf("    Entering %s  with nomSelf: 0x%x. nomSelf is: %s.\n",
-  //           __FUNCTION__, nomSelf, nomSelf->mtab->nomClassName);
-
-  NOMClass_nomInit_parent(nomSelf,  ev);
-}
-
+#if 0
+  CORBA_Environment tempEnv={0};
+  tempEnv.fFlags=NOMENV_FLG_DONT_CHECK_OBJECT;
+#endif
+  //  nomPrintf("    Entering %s  with nomSelf: 0x%x. nomSelf is: %s.\n",
+  //         __FUNCTION__, nomSelf, nomSelf->mtab->nomClassName);
+
+  /* Don't check object pointer. We are just created but not yet registered as a class. */
+  //  NOMClass_nomInit_parent(nomSelf,  &tempEnv);
+  NOMClass_nomInit_parent(nomSelf, NULLHANDLE);
+}
+
+
+
+