svn commit: r814871 - /activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp

[tabish]

Author: tabish
Date: Mon Sep 14 21:37:09 2009
New Revision: 814871

URL: http://svn.apache.org/viewvc?rev=814871&view=rev
Log:
Remove commented out APR thread code and cleanup TODO's

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp

Modified: 
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp
URL: 
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp?rev=814871&r1=814870&r2=814871&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp 
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp Mon 
Sep 14 21:37:09 2009
@@ -52,7 +52,6 @@
         /**
          * APR Thread Handle
          */
-        //apr_thread_t* threadHandle;
         std::auto_ptr<ThreadHandle> threadHandle;
 
         /**
@@ -122,8 +121,6 @@
 
             // Indicate we are done.
             properties->state = Thread::TERMINATED;
-            //            apr_thread_exit( self, APR_SUCCESS );
-            //            return NULL;
         }
 
     };
@@ -192,21 +189,6 @@
                 "Thread::start - Thread already started");
         }
 
-//        DecafRuntime* runtime = dynamic_cast<DecafRuntime*>( 
Runtime::getRuntime() );
-//
-//        apr_status_t err = apr_thread_create(
-//            &this->properties->threadHandle,
-//            NULL,
-//            this->properties->runCallback,
-//            this->properties.get(),
-//            runtime->getGlobalPool() );
-//
-//        if( err != APR_SUCCESS ) {
-//            throw Exception(
-//                __FILE__, __LINE__,
-//                "Thread::start - Could not start thread");
-//        }
-
         this->properties->threadHandle.reset( ThreadImpl::create(
              this, this->properties->runCallback, this->properties.get() ) );
 
@@ -227,8 +209,6 @@
     }
 
     if( this->properties->state != Thread::TERMINATED ) {
-//        apr_status_t threadReturn;
-//        apr_thread_join( &threadReturn, this->properties->threadHandle );
         ThreadImpl::join( this->properties->threadHandle.get() );
     }
 }
@@ -270,7 +250,7 @@
 
////////////////////////////////////////////////////////////////////////////////
 void Thread::sleep( long long millisecs )
     throw( decaf::lang::exceptions::InterruptedException,
-              decaf::lang::exceptions::IllegalArgumentException ) {
+           decaf::lang::exceptions::IllegalArgumentException ) {
 
     if( millisecs < 0 ) {
         throw IllegalArgumentException(
@@ -284,7 +264,7 @@
 
////////////////////////////////////////////////////////////////////////////////
 void Thread::sleep( long long millisecs, unsigned int nanos )
     throw( decaf::lang::exceptions::InterruptedException,
-              decaf::lang::exceptions::IllegalArgumentException ) {
+           decaf::lang::exceptions::IllegalArgumentException ) {
 
     if( millisecs < 0 ) {
         throw IllegalArgumentException(
@@ -298,21 +278,16 @@
             "Thread::sleep( millisecs, nanos ) - Nanoseconds must be in range 
[0...999999]" );
     }
 
-    // TODO -- Add in nanos
-
-//    apr_sleep( (apr_interval_time_t)(millisecs * 1000) );
     ThreadImpl::sleep( millisecs, nanos );
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 void Thread::yield() {
-    //apr_thread_yield();
     ThreadImpl::yeild();
 }
 
 
////////////////////////////////////////////////////////////////////////////////
 long long Thread::getId() {
-    //return (unsigned long)( apr_os_thread_current() );
     return ThreadImpl::getThreadId();
 }