references #1605: implemented option 2

git-svn-id: file:///tmp/cmsos_migration/cmsos.svndb/releases/baseline10/trunk@17802 c528359e-2999-456a-ae53-7ba8edf254b3

psx/sapi/include/psx/sapi/version.h

@@ -18,9 +18,9 @@
 
 #define PSXSAPI_VERSION_MAJOR 2
 #define PSXSAPI_VERSION_MINOR 0
-#define PSXSAPI_VERSION_PATCH 0
+#define PSXSAPI_VERSION_PATCH 1
 // If any previous versions available E.g. #define PSXSAPI_PREVIOUS_VERSIONS "3.8.0,3.8.1"
-#undef	PSXSAPI_PREVIOUS_VERSIONS 
+#define	PSXSAPI_PREVIOUS_VERSIONS "2.0.0"
 
 
 //

psx/sapi/src/common/ApplicationService.cc

@@ -232,7 +232,10 @@ xoap::MessageReference psx::sapi::ApplicationService::onRequest(xoap::MessageRef
 		f.setFaultString(xcept::stdformat_exception_history(e));
 		return reply;
 	}
+
+	pthread_mutex_unlock( &(this->lock_));
 	
+	//std::cout << "Going to wait.. " << std::endl;
 	psx::sapi::Result * result = this->wait(request, timeout);	
 	
 	xoap::MessageReference response;
@@ -243,7 +246,6 @@ xoap::MessageReference psx::sapi::ApplicationService::onRequest(xoap::MessageRef
 	}
 	catch (psx::sapi::exception::Exception & e )
 	{
-		pthread_mutex_unlock( &(this->lock_));
 
 		xoap::MessageReference reply = xoap::createMessage();
         	xoap::SOAPPart soap = reply->getSOAPPart();
@@ -254,7 +256,6 @@ xoap::MessageReference psx::sapi::ApplicationService::onRequest(xoap::MessageRef
 		f.setFaultString(xcept::stdformat_exception_history(e));
 		return reply;	
 	}
-	pthread_mutex_unlock( &(this->lock_));
 
 	return response;
 }
@@ -616,7 +617,7 @@ psx::sapi::Result* psx::sapi::ApplicationService::wait(psx::sapi::Request* reque
 	catch (toolbox::exception::Timeout& e)
 	{
 		// Timeout, return empty result
-		//e.PrintOut();
+		//e.what();
 		return 0;
 	}
 }
@@ -680,7 +681,7 @@ void psx::sapi::ApplicationService::run()
 		pthread_mutex_lock( &(this->mutex_));
 		dispatch(sec, usec);
 		pthread_mutex_unlock( &(this->mutex_));
-		pthread_yield();
+		//pthread_yield();
 	}
 }