Mon Sep 29 14:59:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 22 insertions, 28 deletions

diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 274506e253e..119d25664d6 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -52,7 +52,7 @@ TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void)
 #if defined (ACE_HAS_IPV6) && defined (ACE_USES_IPV4_IPV6_MIGRATION)
   if (ACE::ipv6_enabled())
     default_address_.set (
-      static_cast<unsigned short> (0), 
+      static_cast<unsigned short> (0),
       ACE_IPV6_ANY,
       AF_INET6);
 #endif /* ACE_HAS_IPV6 && ACE_USES_IPV4_IPV6_MIGRATION */
@@ -458,7 +458,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
                   ACCEPT_STRATEGY (this->orb_core_),
                   -1);
 
-  unsigned short requested_port = addr.get_port_number ();
+  unsigned short const requested_port = addr.get_port_number ();
   if (requested_port == 0)
     {
       // don't care, i.e., let the OS choose an ephemeral port
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
index 8a2593ecdb6..19085afc425 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
@@ -62,7 +62,7 @@ public:
 
 private:
   /// Stub for the call back method in the Reply Handler.
-  const TAO_Reply_Handler_Stub reply_handler_stub_;
+  TAO_Reply_Handler_Stub const reply_handler_stub_;
 
   /// Reply Handler passed in the Asynchronous Invocation.
   Messaging::ReplyHandler_var reply_handler_;
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 952b95f9e50..8cbd7aa4ccf 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -91,19 +91,19 @@ void
 TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
                                CORBA::Boolean wait_for_completion)
 {
-  // Is the <wait_for_completion> semantics for this thread correct?
+  // Is the @a wait_for_completion semantics for this thread correct?
   TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
                                                       wait_for_completion);
 
   // This operation changes the state of the POA manager to
   // inactive. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
+  // state, this operation has not effect.  Entering the
   // inactive state causes the associated POAs to reject requests that
   // have not begun to be executed as well as any new requests.
 
   if (this->state_ == PortableServer::POAManager::INACTIVE)
     {
-      throw PortableServer::POAManager::AdapterInactive ();
+      return;
     }
   else
     {
diff --git a/TAO/tao/PortableServer/POAManager.pidl b/TAO/tao/PortableServer/POAManager.pidl
index 05f2e737550..20b01f25b1d 100644
--- a/TAO/tao/PortableServer/POAManager.pidl
+++ b/TAO/tao/PortableServer/POAManager.pidl
@@ -39,8 +39,7 @@ module PortableServer
       raises(AdapterInactive);
 
     void deactivate (in boolean etherealize_objects,
-                     in boolean wait_for_completion)
-      raises(AdapterInactive);
+                     in boolean wait_for_completion);
 #endif
 
     State get_state ();
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 1bba82c7fb4..a177c1f1fbf 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -632,26 +632,21 @@ TAO_Root_POA::find_POA_i (const ACE_CString &child_name,
               this->check_state ();
 
               CORBA::Boolean success = false;
-              try
-                {
-                  // ATTENTION: Trick locking here, see class header for details
-                  TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (
-                    *this);
-                  ACE_UNUSED_ARG (non_servant_upcall);
-
-                  // When unknown_adapter gives a system exception, the POA
-                  // should raise OBJ_ADAPTER with standard minor code 1.
-                  // See 11.3.9.2 of the Corba spec
-                  success =
-                    this->adapter_activator_->unknown_adapter (
-                      this,
-                      child_name.c_str ());
-                }
-              catch (const ::CORBA::SystemException&)
-                {
-                  throw ::CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 1,
-                                              CORBA::COMPLETED_NO);
-                }
+
+              {
+                // ATTENTION: Trick locking here, see class header for details
+                TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (
+                  *this);
+                ACE_UNUSED_ARG (non_servant_upcall);
+
+                // When unknown_adapter gives a system exception, the POA
+                // should just pass the system exception through
+                // See 15.3.9.2 of the 3.1 CORBA spec
+                success =
+                  this->adapter_activator_->unknown_adapter (
+                    this,
+                    child_name.c_str ());
+              }
 
               if (success)
                 {