Thu Mar 7 13:57:18 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

3 files changed, 10 insertions, 20 deletions

diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp
index 0451807d875..c3caa419926 100644
--- a/TAO/utils/logWalker/Invocation.cpp
+++ b/TAO/utils/logWalker/Invocation.cpp
@@ -329,7 +329,6 @@ void
 Invocation::dump_special_details (ostream &strm, int indent, const char *opname)
 {
   char rstat = 0;
-  bool excep_nl = false;
   if (this->repl_octets_ != 0 && this->repl_octets_->has_octets())
     rstat = this->repl_octets_->reply_status();
   int opid = 0;
@@ -341,7 +340,6 @@ Invocation::dump_special_details (ostream &strm, int indent, const char *opname)
                         giop_cdr.length(),
                         giop_cdr.byte_order());
       this->new_line (strm, indent, 8, true, false);
-      excep_nl = true;
       ACE_CDR::ULong len;
       if (cdr >> len)
         {
@@ -367,7 +365,6 @@ Invocation::dump_special_details (ostream &strm, int indent, const char *opname)
       if (cdr >> len)
         {
           this->new_line (strm, indent, 8, true, false);
-          excep_nl = true;
           strm << "name (len = " << len << ") " << cdr.rd_ptr();
         }
     }
@@ -434,7 +431,12 @@ Invocation::dump_special_details (ostream &strm, int indent, const char *opname)
       if (cdr >> len)
         {
           this->new_line (strm, indent, 8, true, false);
-          excep_nl = true;
+          if (this->repl_octets_ == 0)
+            strm << "<nrf> ";
+          else if (ACE_OS::strcmp (opname, "server_is_running") == 0)
+            strm << "<sir> ";
+          else if (ACE_OS::strcmp (opname, "server_is_shutting_down") == 0)
+            strm << "<ssd> ";
           strm << "name ( len = " << len << ") " << cdr.rd_ptr();
         }
     }
@@ -471,7 +473,7 @@ Invocation::dump_special_details (ostream &strm, int indent, const char *opname)
     }
   else
     {
-      this->new_line (strm, indent, 8, true, false); //excep_nl, false);
+      this->new_line (strm, indent, 8, true, false);
       ACE_CDR::ULong len;
       if (rstat == 1 || rstat == 2)
         {
@@ -480,18 +482,6 @@ Invocation::dump_special_details (ostream &strm, int indent, const char *opname)
       else
         {
           strm << "Redirect to ";
-          if (cdr >> len)
-            {
-             cdr.skip_bytes(len);
-             strm << "(first skip " << len << ") ";
-            }
-
-          if (cdr >> len)
-            {
-             cdr.skip_bytes(len);
-             strm << "(second skip " << len << ") ";
-            }
-
         }
       if (cdr >> len)
         {
diff --git a/TAO/utils/logWalker/Log.cpp b/TAO/utils/logWalker/Log.cpp
index bf833c76be0..bc43e48bb98 100644
--- a/TAO/utils/logWalker/Log.cpp
+++ b/TAO/utils/logWalker/Log.cpp
@@ -681,8 +681,8 @@ Log::parse_begin_connection_i (void)
 void
 Log::parse_connection_handler_ctor_i (void)
 {
-  char *c = ACE_OS::strchr (this->info_, '[') + 1;
-  size_t handle = ACE_OS::strtol (c, 0, 10);
+  // char *c = ACE_OS::strchr (this->info_, '[') + 1;
+  // size_t handle = ACE_OS::strtol (c, 0, 10);
   // ACE_DEBUG ((LM_DEBUG,"%d: constructed new handler for %d\n", offset_, handle));
 
 }
diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp
index 69850e2daf3..cb19431f45d 100644
--- a/TAO/utils/logWalker/Thread.cpp
+++ b/TAO/utils/logWalker/Thread.cpp
@@ -245,7 +245,7 @@ Thread::get_summary (long &sent_reqs,
        !i.done();
        i.advance())
     {
-      Invocation *inv;
+      Invocation *inv = 0;
       i.next(inv);
       if (inv->sent_request())
         {