diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-09-02 14:11:25 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-09-02 14:11:25 +0000 |
| commit | 16eaccb72f8c3b56383881c91b2fd0fd14bd32fb (patch) | |
| tree | 5c6be1d78ac864bc4cc6a7bb21a0925716cde81b | |
| parent | 27db01da2b1f33e189f220e56acd99587b1d3fe1 (diff) | |
| download | ATCD-16eaccb72f8c3b56383881c91b2fd0fd14bd32fb.tar.gz | |
ChangeLogTag:Sun Sep 01 08:18:37 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp | 6 | ||||
| -rw-r--r-- | TAO/utils/wxNamingViewer/wxBindDialog.cpp | 2 | ||||
| -rw-r--r-- | TAO/utils/wxNamingViewer/wxNamingTree.cpp | 18 |
4 files changed, 21 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4c37abba7ab..6b5ea2a6579 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Sep 2 09:09:30 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp (universal_time): + Only call ACE_OS::gettimeofday() once, not twice, to avoid a + skew. Thanks to Jon Biggar <jon@floorboard.com> for reporting + this. + Sun Sep 1 11:10:51 2002 Ossama Othman <ossama@uci.edu> * orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index 9fc02513790..c94e8964634 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -47,15 +47,17 @@ TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL) CORBA::ULongLong TAO_Time_Base_Offset = ACE_UINT64_LITERAL(0x2D8539C80); #endif + ACE_Time_Value timeofday = ACE_OS::gettimeofday (); + // Return the local time of the system as a UTO. ACE_NEW_THROW_EX (uto, TAO_UTO ((TAO_Time_Base_Offset + ACE_static_cast(CORBA::ULongLong, - ACE_OS::gettimeofday ().sec ())) * + timeofday.sec ())) * ACE_static_cast(ACE_UINT32, 10000000) + ACE_static_cast(CORBA::ULongLong, - ACE_OS::gettimeofday ().usec () * 10), + timeofday ().usec () * 10), 0, 0), CORBA::NO_MEMORY ()); diff --git a/TAO/utils/wxNamingViewer/wxBindDialog.cpp b/TAO/utils/wxNamingViewer/wxBindDialog.cpp index 5deeecb3508..49c60099050 100644 --- a/TAO/utils/wxNamingViewer/wxBindDialog.cpp +++ b/TAO/utils/wxNamingViewer/wxBindDialog.cpp @@ -76,7 +76,7 @@ bool WxBindDialog::TransferDataFromWindow() } catch(CORBA::Exception& ex) { - wxMessageBox( ex._id(), "Invalid IOR"); + wxMessageBox( ex._rep_id(), "Invalid IOR"); object = CORBA::Object::_nil(); } diff --git a/TAO/utils/wxNamingViewer/wxNamingTree.cpp b/TAO/utils/wxNamingViewer/wxNamingTree.cpp index 9e7daf743d8..5cbb0c8c777 100644 --- a/TAO/utils/wxNamingViewer/wxNamingTree.cpp +++ b/TAO/utils/wxNamingViewer/wxNamingTree.cpp @@ -120,7 +120,7 @@ void WxNamingTree::copySelectedToClipboard() } catch( CORBA::Exception& ex) { - wxMessageBox( ex._id(), "CORBA::Exception"); + wxMessageBox( ex._rep_id(), "CORBA::Exception"); } } @@ -188,7 +188,7 @@ void WxNamingTree::listBindingList( } catch( CORBA::Exception& ex) { - wxMessageBox( ex._id(), "CORBA::Exception"); + wxMessageBox( ex._rep_id(), "CORBA::Exception"); } } @@ -238,7 +238,7 @@ void WxNamingTree::listContext( wxTreeItemId& item) } catch( CORBA::Exception& ex) { - wxMessageBox( ex._id(), "CORBA::Exception"); + wxMessageBox( ex._rep_id(), "CORBA::Exception"); } @@ -285,7 +285,7 @@ void WxNamingTree::onContextPopupBindContext( wxCommandEvent& event) } catch( CORBA::Exception& ex) { wxMessageBox( - ex._id(), + ex._rep_id(), "CORBA::Exception"); } @@ -319,7 +319,7 @@ void WxNamingTree::onContextPopupBindObject( wxCommandEvent& event) } catch( CORBA::Exception& ex) { wxMessageBox( - ex._id(), + ex._rep_id(), "CORBA::Exception"); } @@ -351,7 +351,7 @@ void WxNamingTree::onContextPopupBindNewContext( wxCommandEvent& event) } catch( CORBA::Exception& ex) { wxMessageBox( - ex._id(), + ex._rep_id(), "CORBA::Exception"); } @@ -391,7 +391,7 @@ void WxNamingTree::onContextPopupDestroy( wxCommandEvent&) } catch( CORBA::Exception& ex) { - wxMessageBox( ex._id(), "CORBA::Exception"); + wxMessageBox( ex._rep_id(), "CORBA::Exception"); } } @@ -433,7 +433,7 @@ void WxNamingTree::onContextPopupUnbind( wxCommandEvent&) } catch( CORBA::Exception& ex) { - wxMessageBox( ex._id(), "CORBA::Exception"); + wxMessageBox( ex._rep_id(), "CORBA::Exception"); } } @@ -499,7 +499,7 @@ void WxNamingTree::onObjectPopupUnbind( wxCommandEvent& ) } catch( CORBA::Exception& ex) { - wxMessageBox( ex._id(), "CORBA::Exception"); + wxMessageBox( ex._rep_id(), "CORBA::Exception"); } } |