ChangeLogTag:Wed Dec 1 17:19:39 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>

4 files changed, 26 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b44cd9dcccc..7d5048833c9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Wed Dec  1 17:19:39 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
+
+	  Added minor code while throwing BAD_OPERATION exception in
+	  conformance with the CORBA spec. 
+
+	* tao/IIOP_Endpoint.cpp:
+
+	  Removed a weird DEBUG statemnet. 
+	
+	* tao/SystemException.cpp:
+
+	  Added a minor code lookup table for BAD_OPERATION. 
+
 Wed Dec  1 16:30:00 UTC 2004  Simon Massey  <sma@prismtech.com>
 
         * TAO/TAO_IDL/util/utl_global.cpp
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
index ee5be9b7dfe..ae03f81832c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
@@ -111,7 +111,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt_nl
       << "ACE_CHECK;" << be_nl << be_nl
-      << "servant_upcall.pre_invoke_collocated_request (" 
+      << "servant_upcall.pre_invoke_collocated_request ("
       << be_idt << be_idt_nl
       << "ACE_ENV_SINGLE_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt_nl
@@ -128,7 +128,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << "                             op_len);" << be_nl << be_nl
       << "if (status == -1)" << be_idt_nl
       << "{" << be_idt_nl
-      << "ACE_THROW (CORBA::BAD_OPERATION ());" << be_uidt_nl
+      << "ACE_THROW (CORBA::BAD_OPERATION (2, CORBA::COMPLETED_NO));" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "ACE_TRY" << be_idt_nl
       << "{" << be_idt_nl
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index 707fbd39689..3e63ed7de0d 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -249,10 +249,6 @@ TAO_IIOP_Endpoint::preferred_interfaces (TAO_ORB_Core *oc)
 
   while (pos != ACE_CString::npos)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Pos value is [%d] \n",
-                  pos));
-
       // Do we have a "," or an '\0'?
       ssize_t new_pos = tmp.find (",",
                                   pos + 1);
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index fcef1f108db..ae1e9426a91 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -670,6 +670,12 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       "No PolicyFactory has been registered for the given PolicyType." // 3
     };
 
+  static const char *BAD_OPERATION_TABLE[] =
+    {
+      "ServantManager returned wrong servant type." // 1
+      "Operation or Attribute not known to target object." // 2
+    };
+
   if (minor_code == 0)
     return "*unknown description*";
 
@@ -735,6 +741,9 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       && minor_code < sizeof INV_POLICY_TABLE / sizeof (char *))
     return INV_POLICY_TABLE[minor_code];
 
+  if (exc._is_a ("IDL:omg.org/CORBA/BAD_OPERATION:1.0")
+      && minor_code < sizeof BAD_OPERATION_TABLE / sizeof (char *))
+    return BAD_OPERATION_TABLE[minor_code];
 #else
   ACE_UNUSED_ARG (exc);
   ACE_UNUSED_ARG (minor_code);