diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2012-04-03 16:32:27 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2012-04-03 16:32:27 +0000 |
| commit | e76613a6fc6407f5268ba5f0f7eb964a8b06505c (patch) | |
| tree | 104a6a58eeb522d2e41672402e88c58afeb6ac85 | |
| parent | b19e2f1566df04a01303b6a1d221cb6cb4b3770a (diff) | |
| download | ATCD-e76613a6fc6407f5268ba5f0f7eb964a8b06505c.tar.gz | |
ChangeLogTag:Tue
| -rw-r--r-- | ACE/ChangeLog | 10 | ||||
| -rw-r--r-- | ACE/THANKS | 1 | ||||
| -rw-r--r-- | ACE/ace/ACE.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/Service_Types.cpp | 12 |
4 files changed, 18 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index e69a7f90d08..6c0a7aa9d1c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,13 @@ +Tue Apr 3 16:18:35 UTC 2012 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/ACE.cpp (ACE::timestamp): Fixed an "off-by-one" error that + caused corruption of timestamps when using + ACE_LOG_TIMESTAMP="TIME" env var. Thanks to Andrea Sormanni + <andrea dot sormanni at gmail dot com> for reporting this and + providing a fix. + + Added Andrea to the Hall of Fame! + Fri Mar 30 14:33:58 UTC 2012 Steve Huston <shuston@riverace.com> * examples/C++NPv1/Process_Per_Connection_Logging_Server.cpp: Changed diff --git a/ACE/THANKS b/ACE/THANKS index 390663610f8..baede3f0c04 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2360,6 +2360,7 @@ Chong Wuk Pak <chong dot pak at lmco dot com> Michael Frommberger <michael dot frommberger at gmx dot net> Andrey Karpov <karpov at viva64 dot com> Dmytro Ovdiienko <dmitriy dot ovdienko at gmail.com> +Andrea Sormanni <andrea dot sormanni at gmail dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 3fedcc67109..e3268798a1e 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -2421,7 +2421,7 @@ ACE::timestamp (const ACE_Time_Value& time_value, tms.tm_sec, static_cast<long> (cur_time.usec())); date_and_time[date_and_timelen - 1] = '\0'; - return &date_and_time[11 + (return_pointer_to_first_digit != 0)]; + return &date_and_time[10 + (return_pointer_to_first_digit != 0)]; } // This function rounds the request to a multiple of the page size. diff --git a/ACE/ace/Service_Types.cpp b/ACE/ace/Service_Types.cpp index 3342189c226..a0e47bfcd53 100644 --- a/ACE/ace/Service_Types.cpp +++ b/ACE/ace/Service_Types.cpp @@ -182,12 +182,12 @@ ACE_Module_Type::init (int argc, ACE_TCHAR *argv[]) const void *obj = this->object (); MT_Module *mod = (MT_Module *) obj; // - // Change the Module's name to what's in the svc.conf file. - // We must do this so the names match up so everything shuts - // down properly during the call to ACE_Stream_Type::fini - // which calls MT_Stream::remove([name]) for all the modules. - // If the calls to remove fail, we end up with a double delete - // during shutdown. Bugzilla #3847 + // Change the Module's name to what's in the svc.conf file. We must + // do this so the names match up so everything shuts down properly + // during the call to ACE_Stream_Type::fini which calls + // MT_Stream::remove([name]) for all the modules. If the calls to + // remove fail, we end up with a double delete during + // shutdown. Bugzilla #3847 // mod->name (this->name_); MT_Task *reader = mod->reader (); |