summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-12-03 21:38:07 +0000
committermitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-12-03 21:38:07 +0000
commit74136cbf066e5cf611436a1e293fe2e4d3ee5785 (patch)
tree3f4db2c917a8752b19edb8adab7a65802bb1cd45
parent9b4ec33ae917de0308bb5cb9b664e705ac0abd0e (diff)
downloadATCD-74136cbf066e5cf611436a1e293fe2e4d3ee5785.tar.gz
ChangeLogTag: Fri Dec 3 21:34:48 UTC 2010 Adam Mitz <mitza@ociweb.com>
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/utils/logWalker/Invocation.cpp2
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4543706743a..9fc2df86801 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Fri Dec 3 21:34:48 UTC 2010 Adam Mitz <mitza@ociweb.com>
+
+ * utils/logWalker/Invocation.cpp:
+
+ Updated logWalker to handle the new logging time format from the
+ ACE commit: Thu Dec 2 18:29:36 UTC 2010 Steve Huston
+ This patch was submitted by Thomas Lockhart
+ <Thomas dot Lockhart at jpl dot nasa dot gov>.
+
Fri Dec 3 19:33:25 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
* tests/IDL_Test/array_anon_nested.idl:
diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp
index cad43310921..1fe1e3d533b 100644
--- a/TAO/utils/logWalker/Invocation.cpp
+++ b/TAO/utils/logWalker/Invocation.cpp
@@ -139,8 +139,6 @@ Invocation::GIOP_Buffer::GIOP_Buffer(const char *text,
timebuf[time_tok - text] = 0;
char *hms = ACE_OS::strchr (timebuf,' ');
if (hms != 0)
- hms = ACE_OS::strchr (hms + 1, ' ');
- if (hms != 0)
{
int hr, min, sec, msec;
::sscanf (hms+1,"%d:%d:%d.%d", &hr, &min, &sec, &msec);