ChangeLogTag:Sun Mar 18 21:13:36 2001 Ossama Othman <ossama@uci.edu>

6 files changed, 29 insertions, 35 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index cabaae9f56b..7dfe6e299fc 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,18 @@
+Sun Mar 18 21:13:36 2001  Ossama Othman  <ossama@uci.edu>
+
+	* tao/IORInfo.cpp (add_ior_component_to_profile):
+	* tao/Object_Ref_Table.cpp (register_initial_reference): 
+	* tao/PolicyFactory_Registry.cpp (register_policy_factory):
+
+	  Added missing OMG assigned exception minor codes to ACE_THROW
+	  expressions.
+
+	* tao/corbafwd.h:
+	* tao/CORBALOC_Parser.cpp (parse_string_count_helper):
+	* tao/CORBANAME_Parser.cpp (parse_string_dynamic_request_helper):
+
+	  Removed uses of needless TAO_OMG_MINOR_BAD_PARAM_10 macro.
+
 Sun Mar 18 16:28:03 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tao/Exception.h:
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index c607c4cfa68..1537534d0c0 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -55,8 +55,7 @@ TAO_CORBALOC_Parser::parse_string_count_helper (const char * &corbaloc_name,
               ACE_ERROR((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) Invalid Syntax\n")));
 
-              ACE_THROW (CORBA::BAD_PARAM (TAO_OMG_VMCID |
-                                           TAO_OMG_MINOR_BAD_PARAM_10,
+              ACE_THROW (CORBA::BAD_PARAM (TAO_OMG_VMCID | 10,
                                            CORBA::COMPLETED_NO));
             }
         }
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 7a8c93e856d..7e69d543c96 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -80,7 +80,7 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
 	  ACE_UNUSED_ARG (ex);
 
 	  ACE_THROW_RETURN (
-	      CORBA::BAD_PARAM (TAO_OMG_VMCID |	TAO_OMG_MINOR_BAD_PARAM_10,
+	      CORBA::BAD_PARAM (TAO_OMG_VMCID |	10,
 				CORBA::COMPLETED_YES),
 	      CORBA::Object::_nil ()
 	    );
@@ -101,7 +101,7 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
 	  //	be simply raised, and any RESTART is handled
 	  //	already...  leave this here "just in case".
 	  ACE_THROW_RETURN (
-	      CORBA::BAD_PARAM (TAO_OMG_VMCID |	TAO_OMG_MINOR_BAD_PARAM_10,
+	      CORBA::BAD_PARAM (TAO_OMG_VMCID |	10,
 				CORBA::COMPLETED_YES),
 	      CORBA::Object::_nil ()
 	    );
diff --git a/TAO/tao/IORInfo.cpp b/TAO/tao/IORInfo.cpp
index f6afa882cb1..305ea12228e 100644
--- a/TAO/tao/IORInfo.cpp
+++ b/TAO/tao/IORInfo.cpp
@@ -45,11 +45,8 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type,
   // TODO: Now check the global ORB policies.
   // ........
 
-  ACE_THROW_RETURN (CORBA::INV_POLICY (
-                      CORBA_SystemException::_tao_minor_code (
-			TAO_DEFAULT_MINOR_CODE,
-                        EINVAL),
-                      CORBA::COMPLETED_NO),
+  ACE_THROW_RETURN (CORBA::INV_POLICY (TAO_OMG_VMCID | 2,
+                                       CORBA::COMPLETED_NO),
 		    CORBA::Policy::_nil ());
 }
 
@@ -99,12 +96,8 @@ TAO_IORInfo::add_ior_component_to_profile (
   // According to the Portable Interceptor specification, we're
   // supposed to throw a CORBA::BAD_PARAM exception if no profile
   // matched the given ProfileId.
-  // @todo: We need the proper minor code as soon as the spec is
-  //        updated.
   if (found_profile == 0)
     ACE_THROW (CORBA::BAD_PARAM (
-                 CORBA_SystemException::_tao_minor_code (
-                   TAO_DEFAULT_MINOR_CODE,
-                   EINVAL),
+                 TAO_OMG_VMCID | 26,
                  CORBA::COMPLETED_NO));
 }
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index a8d6f5ac5c0..c1bfcadb7c4 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -41,24 +41,15 @@ TAO_Object_Ref_Table::register_initial_reference (
   CORBA::Environment &ACE_TRY_ENV)
 {
   if (id == 0)
-    ACE_THROW (CORBA::BAD_PARAM (
-                 CORBA::SystemException::_tao_minor_code (
-                   TAO_DEFAULT_MINOR_CODE,
-                   EINVAL),
-                 CORBA::COMPLETED_NO));
+    ACE_THROW (CORBA::BAD_PARAM (TAO_OMG_VMCID | 24,
+                                 CORBA::COMPLETED_NO));
   else if (ACE_OS_String::strlen (id) == 0)
-    ACE_THROW (CORBA::BAD_PARAM (
-                 CORBA::SystemException::_tao_minor_code (
-                   TAO_DEFAULT_MINOR_CODE,
-                   EINVAL),
-                 CORBA::COMPLETED_NO));
+    ACE_THROW (CORBA::BAD_PARAM (TAO_OMG_VMCID | 24,
+                                 CORBA::COMPLETED_NO));
 
   if (CORBA::is_nil (obj))
-    ACE_THROW (CORBA::INV_OBJREF (
-                 CORBA_SystemException::_tao_minor_code (
-                   TAO_DEFAULT_MINOR_CODE,
-                   EINVAL),
-                 CORBA::COMPLETED_NO));
+    ACE_THROW (CORBA::BAD_PARAM (TAO_OMG_VMCID | 24,
+                                 CORBA::COMPLETED_NO));
 
   int result = this->bind (id, obj);
 
diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp
index eb9a343e891..3064fe853f7 100644
--- a/TAO/tao/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PolicyFactory_Registry.cpp
@@ -43,12 +43,8 @@ TAO_PolicyFactory_Registry::register_policy_factory (
     {
       // PolicyFactory of given type already exists.
 
-      /**
-       * @todo
-       * Fill in the appropriate minor code once the OMG decides what
-       * it should be.
-       */
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+      ACE_THROW (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 12,
+                                       CORBA::COMPLETED_NO));
     }
   else if (result == -1)
     {