Patches from Paul for Debian

diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc
index 6ff28f1760c11c3384773275a5c9f6e571a1bdec..eebc5a86b8fd5a164125f7c9ce332827be2ec562 100644 (file)
--- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc
+++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc
@@ -182,19 +182,30 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckShape (GEOM::GEOM_Object_ptr theS
   //Set a not done flag
   GetOperations()->SetNotDone();
 
-  if (theShape == NULL) return 0;
+  if (theShape == NULL)
+    {
+      theDescription = CORBA::string_dup("null");
+      return 0;
+    }
 
   //Get the reference shape
   Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject
     (theShape->GetStudyID(), theShape->GetEntry());
 
-  if (aShape.IsNull()) return 0;
+  if (aShape.IsNull())
+    {
+      theDescription = CORBA::string_dup("null2");
+      return 0;
+    }
 
   // Get shape parameters
   TCollection_AsciiString aDump;
-  if (GetOperations()->CheckShape(aShape, aDump)) return 1;
-
-  theDescription = CORBA::string_dup(aDump.ToCString());
+  if (GetOperations()->CheckShape(aShape, aDump))
+    {
+      theDescription = CORBA::string_dup(aDump.ToCString());
+      return 1;
+    }
+  theDescription = CORBA::string_dup("checkShape 0");
   return 0;
 }