ChangeLogTag: Mon Dec 13 11:58:49 2004 Chad Elliott <elliott_c@ociweb.com>

17 files changed, 152 insertions, 101 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2cc007fc5e8..e8bc5c69c82 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,45 @@
+Mon Dec 13 11:58:49 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * interop-tests/wchar/client.cpp:
+
+          Avoid build warnings from vc71 about mixing CORBA::Boolean and
+          int.
+
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp:
+
+          Added missing \n from many ACE_ERROR and ACE_DEBUG messages.
+
+        * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp:
+        * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp:
+
+          Fixed a bug where the timer would not get canceled in the shutdown
+          method as it should.
+
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h:
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp:
+
+          Renamed the deliver request method as it is not called by anything
+          that I could find.  This eliminates a warning about virtual method
+          hiding.
+
+        * orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc:
+
+          Avoid pulling in the idl files (if any are left around from the
+          previous test run).
+
+        * orbsvcs/tests/Bug_1393_Regression/run_test.pl:
+
+          Use the -Sc option and delete the .inl files when the test is
+          done.
+
 Mon Dec 13 13:37:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/IFR_Service/diffs/*.diff:
@@ -17,10 +59,10 @@ Mon Dec 13 08:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Mon Dec 13 04:35:19 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* Release:
+        * Release:
 
-	  Removed referebcs to old files and added autoconf specific files
-	  into the release.
+          Removed referebcs to old files and added autoconf specific files
+          into the release.
 
 Sun Dec 12 19:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -131,14 +173,14 @@ Sat Dec 11 17:51:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sat Dec 11 17:10:57 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
- 	* orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc:
-	* orbsvcs/tests/BiDir_CORBALOC/README:
-	* orbsvcs/tests/BiDir_CORBALOC/TimeModule.idl:
-	* orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp:
-	* orbsvcs/tests/BiDir_CORBALOC/run_test.pl:
+        * orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc:
+        * orbsvcs/tests/BiDir_CORBALOC/README:
+        * orbsvcs/tests/BiDir_CORBALOC/TimeModule.idl:
+        * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp:
+        * orbsvcs/tests/BiDir_CORBALOC/run_test.pl:
 
-	  A new test for testing BiDirGIOP with CORBALOC URL's. Wanted to
-	  have a unit test for this for a long time.
+          A new test for testing BiDirGIOP with CORBALOC URL's. Wanted to
+          have a unit test for this for a long time.
 
 Sat Dec 11 16:14:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -325,18 +367,18 @@ Thu Dec  9 12:37:31 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
         * tao/IFR_Client/IFR_Components.pidl:
 
           Moved the "omg.org" typeprefix directive from the ComponentIR
- 	  module to the enclosing CORBA module.  This move does not affect
- 	  any of the C++ generated code, but it eliminates an error when
- 	  the IFR loader is loading this file into the repository. Seeing
- 	  the CORBA module without a typeprefix gives it a repository id
- 	  (which we don't generate for modules in C++) that doesn't
- 	  include the prefix. The IFR loader looks up this id in the
- 	  repository, doesn't find it (one including the prefix is already
- 	  there) and so tries to create an entry for the module again.
-  	  This causes a BAD_PARAM exception to be thrown due to the
- 	  resulting local name clash. Thanks to Arjun Thounaojam
- 	  <arjun.thounaojam@wipro.com> for reporting the problem when
- 	  loading the file into the repository for use with CorbaScript.
+          module to the enclosing CORBA module.  This move does not affect
+          any of the C++ generated code, but it eliminates an error when
+          the IFR loader is loading this file into the repository. Seeing
+          the CORBA module without a typeprefix gives it a repository id
+          (which we don't generate for modules in C++) that doesn't
+          include the prefix. The IFR loader looks up this id in the
+          repository, doesn't find it (one including the prefix is already
+          there) and so tries to create an entry for the module again.
+          This causes a BAD_PARAM exception to be thrown due to the
+          resulting local name clash. Thanks to Arjun Thounaojam
+          <arjun.thounaojam@wipro.com> for reporting the problem when
+          loading the file into the repository for use with CorbaScript.
 
 Thu Dec  9 18:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/TAO/interop-tests/wchar/client.cpp b/TAO/interop-tests/wchar/client.cpp
index e1a80ee4246..626c1b74b54 100644
--- a/TAO/interop-tests/wchar/client.cpp
+++ b/TAO/interop-tests/wchar/client.cpp
@@ -185,7 +185,7 @@ run_one_test (interop::WChar_Passer_ptr server,
         interop::wstructseq_var wsList =
           server->wstructseq_from_server(data_set ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN(0);
-        CORBA::Boolean result = 1;
+        int result = 1;
 
         for (CORBA::ULong i = 0; i < wsList->length(); i++)
           result &= ref.match_wstring (data_set,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index b75bd1e1333..3225218ea60 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -267,21 +267,21 @@ TAO_ECG_CDR_Message_Receiver::handle_input (
       if (errno == EWOULDBLOCK)
         return 0;
 
-      ACE_ERROR_RETURN ((LM_ERROR, "Error reading mcast fragment (%m)."),
+      ACE_ERROR_RETURN ((LM_ERROR, "Error reading mcast fragment (%m).\n"),
                         -1);
     }
 
   if (n == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Trying to read mcast fragment: "
-                                  "read 0 bytes from socket."),
+                                  "read 0 bytes from socket.\n"),
                         0);
     }
 
   if (n < TAO_ECG_CDR_Message_Sender::ECG_HEADER_SIZE)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Trying to read mcast fragment: "
-                                   "# of bytes read < mcast header size."),
+                                   "# of bytes read < mcast header size.\n"),
                          -1);
     }
 
@@ -379,19 +379,19 @@ TAO_ECG_CDR_Message_Receiver::mark_received (const ACE_INET_Addr &from,
   if (request == 0)
     {
       ACE_DEBUG ((LM_WARNING, "Received mcast request with sequence"
-                              "below currently expected range."));
+                              "below currently expected range.\n"));
       return 0;
     }
   if (*request == &Request_Completed_)
     {
       ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment. "
-                           "(Request already complete)."));
+                           "(Request already complete).\n"));
       return 0;
     }
   if (*request != 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Inconsistent fragments for "
-                                   "mcast request."),
+                                   "mcast request.\n"),
                          -1);
     }
 
@@ -418,13 +418,13 @@ TAO_ECG_CDR_Message_Receiver::process_fragment (
   if (request == 0)
     {
       ACE_DEBUG ((LM_WARNING, "Received mcast request with sequence "
-                              "below currently expected range."));
+                              "below currently expected range.\n"));
       return 0;
     }
   if (*request == &Request_Completed_)
     {
       ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment. "
-                           "(Request already complete)."));
+                           "(Request already complete).\n"));
       return 0;
     }
   if (*request == 0)
@@ -447,14 +447,14 @@ TAO_ECG_CDR_Message_Receiver::process_fragment (
                                      header.fragment_count) == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "Received invalid mcast fragment."),
+                         "Received invalid mcast fragment.\n"),
                         -1);
     }
 
   // Check whether this fragment was already received.
   if ((*request)->test_received (header.fragment_id) == 1)
     {
-      ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment."));
+      ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment.\n"));
       return 0;
     }
 
@@ -502,7 +502,7 @@ TAO_ECG_CDR_Message_Receiver::get_source_entry (const ACE_INET_Addr &from)
           || this->request_map_.bind (from, requests, entry) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR, "Unable to create hash map "
-                                       "entry for a new request."),
+                                       "entry for a new request.\n"),
                             0);
         }
       requests_aptr.release ();
@@ -521,7 +521,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header,
   if(this->byte_order != 0 && this->byte_order != 1)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Reading mcast packet header: byte "
-                                   "order is neither 0 nor 1, it is %d.",
+                                   "order is neither 0 nor 1, it is %d.\n",
                          this->byte_order),
                         -1);
     }
@@ -538,7 +538,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header,
       || a != 'A' || b != 'B' || c != 'C')
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Error reading magic bytes "
-                                   "in mcast packet header."),
+                                   "in mcast packet header.\n"),
                         -1);
     }
 
@@ -550,7 +550,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header,
       || !header_cdr.read_ulong (this->fragment_count))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                        "Error decoding mcast packet header."),
+                        "Error decoding mcast packet header.\n"),
                         -1);
     }
 
@@ -582,7 +582,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header,
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                         "Invalid mcast fragment: "
-                        "inconsistent header fields."),
+                        "inconsistent header fields.\n"),
                         -1);
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index 002b5f888ff..8c214f9e959 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -22,7 +22,7 @@ TAO_ECG_CDR_Message_Sender::init (
       || endpoint_rptr->dgram ().get_handle () == ACE_INVALID_HANDLE)
     {
       ACE_ERROR ((LM_ERROR, "TAO_ECG_CDR_Message_Sender::init(): "
-                            "nil or unitialized endpoint argument."));
+                            "nil or unitialized endpoint argument.\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 
@@ -38,7 +38,7 @@ TAO_ECG_CDR_Message_Sender::send_message  (const TAO_OutputCDR &cdr,
   if (this->endpoint_rptr_.get () == 0)
     {
       ACE_ERROR ((LM_ERROR, "Attempt to invoke send_message() "
-                            "on non-initialized sender object."));
+                            "on non-initialized sender object.\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 
@@ -256,7 +256,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr,
   if (n > 0 && size_t(n) != expected_n)
     {
       ACE_DEBUG ((LM_ERROR, ("Sent only %d out of %d bytes "
-                              "for mcast fragment."),
+                              "for mcast fragment.\n"),
                   n,
                   expected_n));
     }
@@ -265,18 +265,18 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr,
     {
       if (errno == EWOULDBLOCK)
         {
-          ACE_DEBUG ((LM_ERROR, "Send of mcast fragment failed (%m)."));
+          ACE_DEBUG ((LM_ERROR, "Send of mcast fragment failed (%m).\n"));
           // @@ TODO Use a Event Channel specific exception
           ACE_THROW (CORBA::COMM_FAILURE ());
         }
       else
         {
-          ACE_DEBUG ((LM_WARNING, "Send of mcast fragment blocked (%m)."));
+          ACE_DEBUG ((LM_WARNING, "Send of mcast fragment blocked (%m).\n"));
         }
     }
   else if (n == 0)
     {
-      ACE_DEBUG ((LM_WARNING, "EOF on send of mcast fragment (%m)."));
+      ACE_DEBUG ((LM_WARNING, "EOF on send of mcast fragment (%m).\n"));
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
index edaa2dd4add..de93ffeb41b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
@@ -39,7 +39,7 @@ TAO_ECG_Complex_Address_Server::init (const char *arg)
                                         "Unable to initialize address "
                                         "server: cannot find <@> separator "
                                         "in initialization string "
-                                        "as expected"),
+                                        "as expected\n"),
                             -1);
         }
       size_t len = location - data;
@@ -82,7 +82,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key,
     {
       if (this->default_addr_.set (mcast_addr) == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid "
-                                     "mcast address specified: %s.",
+                                     "mcast address specified: %s.\n",
                            mcast_addr),
                           -1);
       return 0;
@@ -94,7 +94,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key,
   if (*endptr != '\0')
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid "
-                                   "source/type specified: %s.",
+                                   "source/type specified: %s.\n",
                          key),
                         -1);
     }
@@ -103,7 +103,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key,
   if (addr.set (mcast_addr) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid "
-                                   "mcast address specified: %s.",
+                                   "mcast address specified: %s.\n",
                          mcast_addr),
                          -1);
     }
@@ -111,7 +111,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key,
   if (this->mcast_mapping_.bind (header_value, addr) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: error adding "
-                                   "new entry to the mapping."),
+                                   "new entry to the mapping.\n"),
                         -1);
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index 773e41b0041..068957271f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -72,7 +72,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, char* argv[])
                   ACE_ERROR ((LM_ERROR,
                                          "Unsupported <-ECGService> option "
                                          "value: <%s>. Ignoring this option "
-                                         "- using defaults instead.",
+                                         "- using defaults instead.\n",
                             opt));
                   result = -1;
                 }
@@ -98,7 +98,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, char* argv[])
                   ACE_ERROR ((LM_ERROR,
                                   "Unsupported <-ECGAddressServer> "
                                   "option value: <%s>. Ignoring this "
-                                  "option - using defaults instead.",
+                                  "option - using defaults instead.\n",
                               opt));
                   result = -1;
                 }
@@ -136,7 +136,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, char* argv[])
                   ACE_ERROR ((LM_ERROR,
                                   "Unsupported <-ECGHandler> "
                                   "option value: <%s>. Ignoring this "
-                                  "option - using defaults instead.",
+                                  "option - using defaults instead.\n",
                               opt));
                   result = -1;
                 }
@@ -197,7 +197,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, char* argv[])
           arg_shifter.ignore_arg ();
           ACE_DEBUG ((LM_WARNING,
                              "Ignoring <%s> option "
-                             "during initialization.",
+                             "during initialization.\n",
                       arg));
           result = -1;
         }
@@ -247,7 +247,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void)
     {
       ACE_DEBUG ((LM_ERROR,
                       "Configurations for mcast handler and "
-                      "address server do not match."));
+                      "address server do not match.\n"));
       return -1;
     }
 
@@ -258,7 +258,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void)
     {
       ACE_DEBUG ((LM_ERROR,
                       "Address server initializaton "
-                      "argument not specified."));
+                      "argument not specified.\n"));
       return -1;
     }
 
@@ -266,7 +266,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void)
       && this->ip_multicast_loop_ != 1)
     {
       ACE_DEBUG ((LM_ERROR,
-                  "IP MULTICAST LOOP option must have a boolean value."));
+                  "IP MULTICAST LOOP option must have a boolean value.\n"));
       return -1;
     }
 
@@ -274,7 +274,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void)
       && this->non_blocking_ != 1)
     {
       ACE_DEBUG ((LM_ERROR,
-                  "NON BLOCKING flag must have a boolean value."));
+                  "NON BLOCKING flag must have a boolean value.\n"));
       return -1;
     }
 
@@ -306,7 +306,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void)
     {
       ACE_ERROR ((LM_ERROR,
                              "Cannot open dgram "
-                             "for sending mcast messages."));
+                             "for sending mcast messages.\n"));
       return TAO_ECG_Refcounted_Endpoint ();
     }
 
@@ -325,7 +325,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void)
         {
           ACE_ERROR ((LM_ERROR,
                       "Error setting TTL option on dgram "
-                      "for sending mcast messages."));
+                      "for sending mcast messages.\n"));
           return TAO_ECG_Refcounted_Endpoint ();
         }
     }
@@ -337,7 +337,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void)
     {
       ACE_ERROR ((LM_ERROR,
                   "Error setting MULTICAST_LOOP option "
-                  "on dgram for sending mcast messages."));
+                  "on dgram for sending mcast messages.\n"));
       return TAO_ECG_Refcounted_Endpoint ();
     }
 
@@ -345,7 +345,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void)
       && dgram.enable(ACE_NONBLOCK) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  "Error setting NON BLOCKING option."));
+                  "Error setting NON BLOCKING option.\n"));
       return TAO_ECG_Refcounted_Endpoint ();
     }
 
@@ -405,7 +405,7 @@ TAO_ECG_Mcast_Gateway::init_address_server (void)
     {
       ACE_ERROR ((LM_ERROR,
                   "Cannot create address server: "
-                  "unknown address server type specified."));
+                  "unknown address server type specified.\n"));
       return 0;
     }
 }
@@ -465,7 +465,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
         {
           ACE_ERROR ((LM_ERROR,
                       "ERROR using address server argument "
-                      "in ACE_INET_Addr.set ()."));
+                      "in ACE_INET_Addr.set ().\n"));
           return TAO_ECG_Refcounted_Handler ();
         }
       if (h->open (ipaddr) != 0)
@@ -476,7 +476,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
     {
       ACE_ERROR ((LM_ERROR,
                   "Cannot create handler: unknown "
-                  "handler type specified."));
+                  "handler type specified.\n"));
       return handler;
     }
 
@@ -578,14 +578,14 @@ TAO_ECG_Mcast_Gateway::verify_args (CORBA::ORB_ptr orb,
     {
       ACE_ERROR ((LM_ERROR,
                   "Nil event channel argument passed to "
-                  "TAO_ECG_Mcast_Gateway::run()."));
+                  "TAO_ECG_Mcast_Gateway::run().\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
   if (CORBA::is_nil (orb))
     {
       ACE_ERROR ((LM_ERROR,
                   "Nil orb argument passed to "
-                  "TAO_ECG_Mcast_Gateway::run()."));
+                  "TAO_ECG_Mcast_Gateway::run().\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 }
@@ -610,7 +610,7 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb,
   if (!address_server_servant.in ())
     {
       ACE_DEBUG ((LM_ERROR,
-                  "Unable to create address server."));
+                  "Unable to create address server.\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
index da28d20b8e0..278ffbbfc42 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
@@ -35,14 +35,14 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr,
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Unable to open mcast handler: "
                        "error using specified address %s "
-                       "in ACE_INET.set ().",
+                       "in ACE_INET.set ().\n",
                        mcast_addr),
                       -1);
 
   if (this->dgram_.subscribe (mcast_group, 1, net_if) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                       "Unable to open mcast handler: error "
-                      "subscribing to %s",
+                      "subscribing to %s\n",
                        mcast_addr),
                       -1);
 
@@ -55,7 +55,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr,
     {
       this->dgram_.close ();
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "Cannot register handler with reactor."),
+                         "Cannot register handler with reactor.\n"),
                         -1);
     }
 
@@ -78,13 +78,13 @@ TAO_ECG_Simple_Mcast_EH::shutdown (void)
   if (result != 0)
     ACE_ERROR ((LM_ERROR,
                 "Unable to deregister handler from reactor "
-                "on shutdown."));
+                "on shutdown.\n"));
 
   result = this->dgram_.close ();
   if (result != 0)
     ACE_ERROR ((LM_ERROR,
                 "Unable to close mcast receiving dgram "
-                "on shutdown."));
+                "on shutdown.\n"));
 
   this->receiver_ = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
index 016fac6849a..d57d733eefc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
@@ -31,7 +31,7 @@ TAO_ECG_UDP_EH::open (const ACE_INET_Addr& ipaddr,
   if (this->dgram_.open (ipaddr, PF_INET, 0, reuse_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Unable to open udp handler: "
-                       "error opening receiving dgram."),
+                       "error opening receiving dgram.\n"),
                        -1);
 
   if (!this->reactor ()
@@ -41,7 +41,7 @@ TAO_ECG_UDP_EH::open (const ACE_INET_Addr& ipaddr,
     {
       this->dgram_.close ();
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "Cannot register handler with reactor."),
+                         "Cannot register handler with reactor.\n"),
                         -1);
     }
 
@@ -64,12 +64,12 @@ TAO_ECG_UDP_EH::shutdown (void)
   if (result != 0)
     ACE_ERROR ((LM_ERROR,
                 "Unable to deregister handler from reactor "
-                "on shutdown."));
+                "on shutdown.\n"));
 
   result = this->dgram_.close ();
   if (result != 0)
     ACE_ERROR ((LM_ERROR,
-                "Unable to close receiving dgram on shutdown."));
+                "Unable to close receiving dgram on shutdown.\n"));
 
   this->receiver_ = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 0fdccc40c53..73e309bcedf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -37,7 +37,7 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
     {
       ACE_ERROR ((LM_ERROR,
                   "TAO_ECG_UDP_Receiver::init(): "
-                  "<lcl_ec> argument is nil."));
+                  "<lcl_ec> argument is nil.\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 
@@ -58,7 +58,7 @@ TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub
     {
       ACE_ERROR ((LM_ERROR,
                   "Error initializing TAO_ECG_UDP_Receiver: "
-                  "init() hasn't been called before connect()."));
+                  "init() hasn't been called before connect().\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 
@@ -66,7 +66,7 @@ TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub
     {
       ACE_ERROR ((LM_ERROR,
                   "TAO_ECG_UDP_Receiver::connect(): "
-                  "0-length publications argument."));
+                  "0-length publications argument.\n"));
       ACE_THROW (CORBA::INTERNAL ());
     }
 
@@ -188,7 +188,7 @@ TAO_ECG_Event_CDR_Decoder::decode (TAO_InputCDR &cdr)
   if (!(cdr >> this->events))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "Error decoding events cdr."),
+                         "Error decoding events cdr.\n"),
                         -1);
     }
   return 0;
@@ -207,7 +207,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
           ACE_ERROR ((LM_ERROR,
                       "TAO_ECG_UDP_Receiver::handle_input() "
                       "called but the Receiver is not connected "
-                      "to an event channel. Shutting down the Receiver."));
+                      "to an event channel. Shutting down the Receiver.\n"));
           this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -226,7 +226,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
       if (result == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                            "Error receiving multicasted events."),
+                            "Error receiving multicasted events.\n"),
                             0);
         }
 
@@ -238,7 +238,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
     {
       ACE_DEBUG ((LM_ERROR,
                   "Caught and swallowed EXCEPTION in "
-                  "ECG_UDP_Receiver::handle_input: %s",
+                  "ECG_UDP_Receiver::handle_input: %s\n",
                   ACE_ANY_EXCEPTION._info ().c_str ()));
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
index 3f6a64bb48c..39ff8265264 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
@@ -90,7 +90,7 @@ TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header,
       ACE_ERROR ((LM_ERROR,
                   "TAO_ECG_UDP_Receiver::get_addr() called but "
                   "nil Address Server was supplied during "
-                  "initialization through init()."));
+                  "initialization through init().\n"));
 
       ACE_THROW (CORBA::INTERNAL ());
     }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index eb368de2dbb..6359f3b26ee 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -145,7 +145,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[])
           arg_shifter.ignore_arg ();
           ACE_DEBUG ((LM_WARNING,
                              "Ignoring <%s> option "
-                             "during initialization.",
+                             "during initialization.\n",
                       arg));
           result = -1;
         }
@@ -161,7 +161,7 @@ TAO_EC_Gateway_IIOP_Factory::unsupported_option_value (const char * option_name,
   ACE_ERROR ((LM_ERROR,
               "EC_Gateway_IIOP_Factory -"
               "Unsupported <%s> option value: <%s>. "
-              "Ignoring this option - using defaults instead.",
+              "Ignoring this option - using defaults instead.\n",
               option_name,
               option_value));
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index e7caa3e8b87..22b61364015 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -27,6 +27,9 @@ TAO_EC_Reactive_ConsumerControl::
     adapter_ (this),
     event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+    , timer_id_ (-1)
+#endif /* TAO_HAS_CORBA_MESSAGING != 0*/
 {
   this->reactor_ =
     this->orb_->orb_core ()->reactor ();
@@ -132,11 +135,11 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
         // Schedule the timer after these policies has been set, because the
         // handle_timeout uses these policies, if done in front, the channel
         // can crash when the timeout expires before initiazation is ready.
-        long id = this->reactor_->schedule_timer (&this->adapter_,
-                                                  0,
-                                                  this->rate_,
-                                                  this->rate_);
-        if (id == -1)
+        timer_id_ = this->reactor_->schedule_timer (&this->adapter_,
+                                                    0,
+                                                    this->rate_,
+                                                    this->rate_);
+        if (timer_id_ == -1)
           return -1;
       }
     }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index 8a5ab7044e1..a2e0577d317 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -27,6 +27,9 @@ TAO_EC_Reactive_SupplierControl::
     adapter_ (this),
     event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+    , timer_id_ (-1)
+#endif /* TAO_HAS_CORBA_MESSAGING != 0*/
 {
   this->reactor_ =
     this->orb_->orb_core ()->reactor ();
@@ -124,11 +127,11 @@ TAO_EC_Reactive_SupplierControl::activate (void)
         // Schedule the timer after these policies has been set, because the
         // handle_timeout uses these policies, if done in front, the channel
         // can crash when the timeout expires before initiazation is ready.
-        long id = this->reactor_->schedule_timer (&this->adapter_,
-                                                  0,
-                                                  this->rate_,
-                                                  this->rate_);
-        if (id == -1)
+        timer_id_ = this->reactor_->schedule_timer (&this->adapter_,
+                                                    0,
+                                                    this->rate_,
+                                                    this->rate_);
+        if (timer_id_ == -1)
           return -1;
       }
     }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index 2b083e0e98d..c92069294b0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -43,7 +43,7 @@ TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant ,
 }
 
 void
-TAO_Notify_RT_StructuredProxyPushSupplier::deliver (TAO_Notify_Method_Request_Dispatch & request ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::deliver_request (TAO_Notify_Method_Request_Dispatch & request ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
index 524ec25373d..b0badca8a75 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
@@ -46,7 +46,7 @@ public:
                                       CORBA::Long id ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer
-  void deliver (TAO_Notify_Method_Request_Dispatch & request ACE_ENV_ARG_DECL);
+  void deliver_request (TAO_Notify_Method_Request_Dispatch & request ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer, no filtering
   virtual void push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc b/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc
index d788f935b44..ecf5bd1deb9 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Bug_1393_Regression.mpc
@@ -3,7 +3,10 @@
 
 project(*Client): taoclient, ifr_client {
   exename = client
+  IDL_Files {
+  }
+
   Source_Files  {
     client.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
index be6110bda53..3114c65aa87 100755
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
@@ -40,7 +40,7 @@ _EOF_
 close(HANDLE);
 
 $TAO_IDL    = new PerlACE::Process("$tao_idl_bin/tao_idl");
-$TAO_IDL->Arguments("$test_idl");
+$TAO_IDL->Arguments("-Sc $test_idl");
 $result = $TAO_IDL->SpawnWaitKill (30);
 
 # Search one of the stub files for the munged for of the interface name
@@ -69,7 +69,7 @@ if ($result != 0)
 # Delete files created during IDL compilation
 unlink <test*.h>;
 unlink <test*.cpp>;
-unlink <test*.i>;
+unlink <test*.inl>;
    
 # The file name for the IFR service IOR
 $ifr_service_ior_file = PerlACE::LocalFile("ifr.ior");