ChangeLogTag:Thu May 23 15:30:40 2002 Ossama Othman <ossama@uci.edu>

7 files changed, 60 insertions, 32 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 46c861edfe9..4876dcac683 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,42 @@
+Thu May 23 15:30:40 2002  Ossama Othman  <ossama@uci.edu>
+
+	* tao/Cleanup_Func_Registry.h:
+	* tao/debug.h:
+
+	  No need to include `corbafwd.h'.  `TAO_Export.h' is enough.
+
+	* tao/Connection_Handler.h:
+
+	  No need to include `ace/SOCK.h'.  Forward declaring ACE_SOCK is
+	  enough.
+
+	  Removed non-essential forward declarations, i.e. ACE_Reactor and
+	  ACE_Event_Handler.
+
+	  Added forward declarations for TAO_Transport, ACE_SOCK and
+	  ACE_Lock.
+
+	* tao/LF_Event.h:
+
+	  No need to include `corbafwd.h'.  `TAO_Export.h' is enough.
+
+	  No need to forward declare TAO_Transport and
+	  TAO_Leader_Follower.
+
+	* tao/ORB.cpp (register_initial_reference):
+
+	  Removed redundant parameter checks.
+
+	* tao/Object_Ref_Table.cpp (register_initial_reference):
+
+	  Corrected exception thrown if the object ID parameter is
+	  invalid.  CORBA::ORB::InvalidName should be thrown instead of
+	  CORBA::BAD_PARAM.
+
+	  When attempting to register a duplicate object reference, throw
+	  CORBA::ORB::InvalidName instead of CORBA::INV_OBJREF.  This is
+	  required by the spec.
+
 Thu May 23 12:51:51 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
         * TAO_IDL/fe/idl.ll:
diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h
index e0359acea7c..1a6bfaf294f 100644
--- a/TAO/tao/Cleanup_Func_Registry.h
+++ b/TAO/tao/Cleanup_Func_Registry.h
@@ -14,13 +14,13 @@
 #define TAO_CLEANUP_FUNC_REGISTRY_H
 #include "ace/pre.h"
 
-#include "corbafwd.h"
-#include "ace/Array_Base.h"
+#include "TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Array_Base.h"
 
 /**
  * @class TAO_Cleanup_Func_Registry
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index 15b6ab05910..4094ca80eda 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -9,12 +9,13 @@
  *  @author Balachandran Natarajan  <bala@cs.wustl.edu>
  */
 //=============================================================================
+
 #ifndef TAO_CONNECTION_HANDLER_H
 #define TAO_CONNECTION_HANDLER_H
+
 #include "ace/pre.h"
 
 #include "LF_Event.h"
-#include "ace/SOCK.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +24,9 @@
 
 class TAO_ORB_Core;
 class TAO_ORB_Core_TSS_Resources;
-class ACE_Reactor;
-class ACE_Event_Handler;
+class TAO_Transport;
+class ACE_SOCK;
+class ACE_Lock;
 
 /**
  * @class TAO_Connection_Handler
@@ -134,4 +136,5 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
+
 #endif /*TAO_CONNECTION_HANDLER_H*/
diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h
index 937d4f8441c..ad1fe1c23ad 100644
--- a/TAO/tao/LF_Event.h
+++ b/TAO/tao/LF_Event.h
@@ -14,15 +14,14 @@
 #define TAO_LF_EVENT_H
 #include "ace/pre.h"
 
-#include "corbafwd.h"
+#include "TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_Transport;
 class TAO_LF_Follower;
-class TAO_Leader_Follower;
+
 /**
  * @class TAO_LF_Event
  *
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 50c8bdbb2f8..2cc143792ce 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1181,11 +1181,6 @@ CORBA_ORB::register_initial_reference (const char * id,
                                        CORBA::Object_ptr obj
                                        ACE_ENV_ARG_DECL)
 {
-  if (id == 0)
-    ACE_THROW (CORBA::ORB::InvalidName ());
-  else if (ACE_OS_String::strlen (id) == 0)
-    ACE_THROW (CORBA::ORB::InvalidName ());
-
   TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table ();
 
   table.register_initial_reference (id, obj ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index 2ed94778f87..1fc68f398bb 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -1,5 +1,6 @@
 #include "Object_Ref_Table.h"
 #include "Object.h"
+#include "ORB.h"
 #include "Exception.h"
 #include "Environment.h"
 #include "CORBA_String.h"
@@ -29,14 +30,9 @@ TAO_Object_Ref_Table::register_initial_reference (
   CORBA::Object_ptr obj
   ACE_ENV_ARG_DECL)
 {
-  if (id == 0)
-    ACE_THROW (CORBA::BAD_PARAM (TAO_OMG_VMCID | 27,
-                                 CORBA::COMPLETED_NO));
-  else if (ACE_OS_String::strlen (id) == 0)
-    ACE_THROW (CORBA::BAD_PARAM (TAO_OMG_VMCID | 27,
-                                 CORBA::COMPLETED_NO));
-
-  if (CORBA::is_nil (obj))
+  if (id == 0 || ACE_OS_String::strlen (id) == 0)
+    ACE_THROW (CORBA::ORB::InvalidName ());
+  else if (CORBA::is_nil (obj))
     ACE_THROW (CORBA::BAD_PARAM (TAO_OMG_VMCID | 27,
                                  CORBA::COMPLETED_NO));
 
@@ -51,7 +47,7 @@ TAO_Object_Ref_Table::register_initial_reference (
                     "the ORB\n",
                     id));
 
-      ACE_THROW (CORBA::INV_OBJREF ());
+      ACE_THROW (CORBA::ORB::InvalidName ());
     }
 
   if (result == -1)
diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h
index c943ed92ea0..10ce93a469d 100644
--- a/TAO/tao/debug.h
+++ b/TAO/tao/debug.h
@@ -1,5 +1,4 @@
-
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -7,10 +6,7 @@
  *
  *  $Id$
  *
- *   debug/trace support.
- *
- *
- *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
+ *  @author  DOC Group - Wash U and UCI
  */
 //=============================================================================
 
@@ -19,7 +15,7 @@
 #define TAO_DEBUG_H
 #include "ace/pre.h"
 
-#include "tao/corbafwd.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,10 +28,10 @@
 // such as process initialization.  They're treated as immutable.
 
 // 0 to ??; higher == more
-extern TAO_Export u_int TAO_debug_level;
+extern TAO_Export unsigned int TAO_debug_level;
 
 // debug messages on (1) or off (0)
-extern TAO_Export u_int TAO_orbdebug;
+extern TAO_Export unsigned int  TAO_orbdebug;
 
 #include "ace/post.h"
 #endif /* TAO_DEBUG_H */