summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-02-16 16:05:46 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-02-16 16:05:46 +0000
commit79b9d1672151141892cc790337b501b692582d5c (patch)
tree08f543bc82b30b76739f76cd0f7472285309ff1f
parentbacb67f9edbd2a9bcf0e5588cc45f3f4fb32373b (diff)
downloadATCD-79b9d1672151141892cc790337b501b692582d5c.tar.gz
ChangeLogTag: Thu Feb 16 16:00:07 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service.cpp2
2 files changed, 7 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 580297fcdf0..d806a709795 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 16 16:00:07 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * orbsvcs/Notify_Service/Notify_Service.cpp:
+
+ Revert change that got mixed in with:
+ Thu Feb 16 03:33:02 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
+
Thu Feb 16 12:35:00 UTC Simon Massey <sma@prismtech.com>
* tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc:
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 21f2e3b4bf1..182a27231ac 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -411,7 +411,6 @@ Worker::orb (CORBA::ORB_ptr orb)
int
Worker::svc (void)
{
-#if 0
ACE_hthread_t current;
ACE_Thread::self (current);
@@ -423,7 +422,6 @@ Worker::svc (void)
}
ACE_DEBUG ((LM_DEBUG, "Activated Worker Thread to run the ORB @ priority:%d \n", priority));
-#endif
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY