[Wsf-c-commits] svn commit r33598 - trunk/wsf/cpp/src/main

[nandika at wso2.com]

Author: nandika
Date: Wed Apr 15 21:36:56 2009
New Revision: 33598
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=33598

Log:
code updated

Modified:
   trunk/wsf/cpp/src/main/Environment.cpp
   trunk/wsf/cpp/src/main/Options.cpp
   trunk/wsf/cpp/src/main/ServiceClient.cpp
   trunk/wsf/cpp/src/main/Stub.cpp

Modified: trunk/wsf/cpp/src/main/Environment.cpp
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/cpp/src/main/Environment.cpp?rev=33598&r1=33597&r2=33598&view=diff
==============================================================================
--- trunk/wsf/cpp/src/main/Environment.cpp	(original)
+++ trunk/wsf/cpp/src/main/Environment.cpp	Wed Apr 15 21:36:56 2009
@@ -24,18 +24,18 @@
 
 Environment* WSF_CALL Environment::getInstance()
 {
-	if(_processObj)
+	if(_envObj)
 	{
-		return _processObj;
+		return _envObj;
 	}
 	else
 	{
-		_processObj =  new Environment();
+		_envObj =  new Environment();
 #ifdef WIN32
 		lock = new RWLock();
 		lock->init();
 #endif
-		return _processObj;
+		return _envObj;
 	}
 }
 
@@ -155,7 +155,7 @@
 
 axutil_log_levels_t Environment::_logLevel;
 
-Environment* Environment::_processObj = NULL;
+Environment* Environment::_envObj = NULL;
 
 std::map<int, const axutil_env_t*> Environment::_envmap;
 

Modified: trunk/wsf/cpp/src/main/Options.cpp
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/cpp/src/main/Options.cpp?rev=33598&r1=33597&r2=33598&view=diff
==============================================================================
--- trunk/wsf/cpp/src/main/Options.cpp	(original)
+++ trunk/wsf/cpp/src/main/Options.cpp	Wed Apr 15 21:36:56 2009
@@ -28,6 +28,12 @@
     axis2_options_set_http_method(_wsf_options, getEnv(), http_method.c_str());
 }
 
+
+axis2_options_t* WSF_CALL Options::getAxis2Options()
+{
+	return _wsf_options;
+}
+
 /** @brief getEnableMTOM
   *
   * @todo: document this function

Modified: trunk/wsf/cpp/src/main/ServiceClient.cpp
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/cpp/src/main/ServiceClient.cpp?rev=33598&r1=33597&r2=33598&view=diff
==============================================================================
--- trunk/wsf/cpp/src/main/ServiceClient.cpp	(original)
+++ trunk/wsf/cpp/src/main/ServiceClient.cpp	Wed Apr 15 21:36:56 2009
@@ -113,6 +113,11 @@
     return AXIS2_SUCCESS;
 }
 
+axis2_svc_client_t* WSF_CALL ServiceClient::getAxis2SvcClient()
+{
+	return _wsf_service_client;
+}
+
 /** @brief ~ServiceClient
   *
   * @todo: document this function
@@ -232,7 +237,7 @@
 
 	if (!_wsf_service_client)
 	{
-        WSF_LOG_CRITICAL_MSG("Cannot create service client");
+		WSF_LOG_CRITICAL_MSG(Environment::getEnv()->log, WSF_LOG_SI, "Cannot create service client");
 		return false;
 	}
 

Modified: trunk/wsf/cpp/src/main/Stub.cpp
URL: http://wso2.org/svn/browse/wso2/trunk/wsf/cpp/src/main/Stub.cpp?rev=33598&r1=33597&r2=33598&view=diff
==============================================================================
--- trunk/wsf/cpp/src/main/Stub.cpp	(original)
+++ trunk/wsf/cpp/src/main/Stub.cpp	Wed Apr 15 21:36:56 2009
@@ -24,11 +24,12 @@
 void Stub::init(std::string& client_home, std::string& endpointUri)
 {
 	serviceClient = new ServiceClient(client_home, endpointUri);
+	clientOptions = serviceClient->getOptions();
 }
 
 Options* Stub::getOptions()
 {
-	return options;
+	return clientOptions;
 }
 
 ServiceClient*  Stub::getServiceClient()
@@ -39,8 +40,16 @@
 bool Stub::setServiceClient(ServiceClient *client)
 {
 	if(serviceClient)
+	{
 		delete serviceClient;
+		clientOptions = NULL;
+	}
 	serviceClient = client;
+	if((clientOptions = serviceClient->getOptions())== NULL)
+	{
+		clientOptions = new Options();
+		serviceClient->setOptions(clientOptions);
+	}
 	return true;
 }