You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by na...@apache.org on 2008/12/03 06:27:37 UTC
svn commit: r722782 - in /webservices/axis/trunk/c/src/engine: ./ client/
Author: nadiramra
Date: Tue Dec 2 21:27:36 2008
New Revision: 722782
URL: http://svn.apache.org/viewvc?rev=722782&view=rev
Log:
Minor - remove tabs from code.....replace with spaces.
Modified:
webservices/axis/trunk/c/src/engine/AppScopeHandlerPool.cpp
webservices/axis/trunk/c/src/engine/Axis.cpp
webservices/axis/trunk/c/src/engine/AxisEngine.cpp
webservices/axis/trunk/c/src/engine/DeserializerPool.cpp
webservices/axis/trunk/c/src/engine/HandlerChain.cpp
webservices/axis/trunk/c/src/engine/HandlerLoader.cpp
webservices/axis/trunk/c/src/engine/HandlerLoader.h
webservices/axis/trunk/c/src/engine/HandlerPool.cpp
webservices/axis/trunk/c/src/engine/RequestScopeHandlerPool.cpp
webservices/axis/trunk/c/src/engine/SOAPTransportFactory.cpp
webservices/axis/trunk/c/src/engine/SOAPTransportFactory.h
webservices/axis/trunk/c/src/engine/SerializerPool.cpp
webservices/axis/trunk/c/src/engine/SharedObject.h
webservices/axis/trunk/c/src/engine/XMLParserFactory.cpp
webservices/axis/trunk/c/src/engine/XMLParserFactory.h
webservices/axis/trunk/c/src/engine/client/Call.cpp
webservices/axis/trunk/c/src/engine/client/ClientAxisEngine.cpp
webservices/axis/trunk/c/src/engine/client/Stub.cpp
Modified: webservices/axis/trunk/c/src/engine/AppScopeHandlerPool.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/AppScopeHandlerPool.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/AppScopeHandlerPool.cpp (original)
+++ webservices/axis/trunk/c/src/engine/AppScopeHandlerPool.cpp Tue Dec 2 21:27:36 2008
@@ -43,7 +43,7 @@
AppScopeHandlerPool::~AppScopeHandlerPool ()
{
- logEntryEngine("AppScopeHandlerPool::~AppScopeHandlerPool")
+ logEntryEngine("AppScopeHandlerPool::~AppScopeHandlerPool")
for (map < int, list <BasicHandler*> >::iterator it =
m_Handlers.begin (); it != m_Handlers.end (); it++)
@@ -66,21 +66,21 @@
int AppScopeHandlerPool::getInstance (BasicHandler** pHandler, int nLibId)
{
- logEntryEngine("AppScopeHandlerPool::getInstance")
-
- Lock l(this);
+ logEntryEngine("AppScopeHandlerPool::getInstance")
+
+ Lock l(this);
int Status = AXIS_SUCCESS;
if (m_Handlers.find (nLibId) != m_Handlers.end ())
{
if (m_Handlers[nLibId].empty ())
/* this means that the object is being used by some other thread
- * but we cannot create any more objects because this is an
- * application scope object. So just return SERVER_ENGINE_HANDLERBEINGUSED
- */
+ * but we cannot create any more objects because this is an
+ * application scope object. So just return SERVER_ENGINE_HANDLERBEINGUSED
+ */
{
- logThrowException("AxisEngineException - SERVER_ENGINE_HANDLER_BEING_USED")
-
+ logThrowException("AxisEngineException - SERVER_ENGINE_HANDLER_BEING_USED")
+
throw AxisEngineException(SERVER_ENGINE_HANDLER_BEING_USED);
}
else
@@ -95,25 +95,25 @@
if (AXIS_SUCCESS == Status)
{
/* This just creates the entry in m_Handlers so that next time we
- * know that the DLL is loaded
- */
+ * know that the DLL is loaded
+ */
m_Handlers[nLibId].clear ();
}
}
- logExitWithReturnCode(Status)
+ logExitWithReturnCode(Status)
return Status;
}
int AppScopeHandlerPool::putInstance (BasicHandler* pHandler, int nLibId)
{
- logEntryEngine("AppScopeHandlerPool::putInstance")
+ logEntryEngine("AppScopeHandlerPool::putInstance")
- Lock l(this);
+ Lock l(this);
m_Handlers[nLibId].push_back (pHandler);
- logExitWithReturnCode(AXIS_SUCCESS)
+ logExitWithReturnCode(AXIS_SUCCESS)
return AXIS_SUCCESS;
}
Modified: webservices/axis/trunk/c/src/engine/Axis.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/Axis.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/Axis.cpp (original)
+++ webservices/axis/trunk/c/src/engine/Axis.cpp Tue Dec 2 21:27:36 2008
@@ -357,37 +357,37 @@
status = g_pConfig->readConfFile ();
if (status == AXIS_SUCCESS)
{
- // One can also start trace via Axis::startTrace(). If that has been done,
- // ignore the config file.
- if (!AxisTrace::isLoggingEnabled())
- {
- AxisTrace::setLogFilter(g_pConfig->getAxisConfProperty(AXCONF_LOGFILTER));
-
- if (bServer)
- AxisTrace::startTrace(g_pConfig->getAxisConfProperty(AXCONF_LOGPATH));
- else
- AxisTrace::startTrace(g_pConfig->getAxisConfProperty(AXCONF_CLIENTLOGPATH));
- }
-
- string configProperties = g_pConfig->toString();
- AxisTrace::writeTrace(configProperties.c_str(), configProperties.length());
+ // One can also start trace via Axis::startTrace(). If that has been done,
+ // ignore the config file.
+ if (!AxisTrace::isLoggingEnabled())
+ {
+ AxisTrace::setLogFilter(g_pConfig->getAxisConfProperty(AXCONF_LOGFILTER));
+
+ if (bServer)
+ AxisTrace::startTrace(g_pConfig->getAxisConfProperty(AXCONF_LOGPATH));
+ else
+ AxisTrace::startTrace(g_pConfig->getAxisConfProperty(AXCONF_CLIENTLOGPATH));
+ }
+
+ string configProperties = g_pConfig->toString();
+ AxisTrace::writeTrace(configProperties.c_str(), configProperties.length());
}
// The entry log must start here - may revisit so as to start earlier.
- logEntryEngine("initialize_module")
+ logEntryEngine("initialize_module")
if (bServer) // no client side wsdd processing at the moment
{
if (status == AXIS_SUCCESS)
- {
+ {
try
{
XMLParserFactory::initialize();
}
catch (AxisException& e)
{
- logRethrowException()
-
+ logRethrowException()
+
throw AxisEngineException(e.getExceptionCode(), e.what());
}
@@ -400,8 +400,8 @@
}
catch (AxisException& e)
{
- logRethrowException()
-
+ logRethrowException()
+
throw AxisEngineException(e.getExceptionCode(), e.what());
}
}
@@ -411,7 +411,7 @@
else if (bServer == 0) // client side module initialization
{
if (status == AXIS_SUCCESS)
- {
+ {
XMLParserFactory::initialize();
SOAPTransportFactory::initialize();
@@ -430,10 +430,10 @@
}
g_isRunning = true;
- logExitWithReturnCode(status)
+ logExitWithReturnCode(status)
}
else if (AxisEngine::m_bServer != bServer)
- {
+ {
throw AxisEngineException(SERVER_ENGINE_EXCEPTION);
}
}
@@ -455,7 +455,7 @@
STORAGE_CLASS_INFO
int uninitialize_module ()
{
- logEntryEngine("uninitialize_module")
+ logEntryEngine("uninitialize_module")
start_initializing();
@@ -465,7 +465,7 @@
{
if (--g_uModuleInitialize == 0)
{
- g_isRunning = false;
+ g_isRunning = false;
TypeMapping::uninitialize();
URIMapping::uninitialize();
if (!AxisEngine::m_bServer)
@@ -496,7 +496,7 @@
void Ax_Sleep (int nTime)
{
- PLATFORM_SLEEP(0);
+ PLATFORM_SLEEP(0);
}
@@ -504,41 +504,41 @@
void Axis::initialize(bool bIsServer)
{
- logEntryEngine("Axis::initialize")
+ logEntryEngine("Axis::initialize")
initialize_module(bIsServer);
-
+
logExit()
}
void Axis::terminate()
{
- logEntryEngine("Axis::terminate")
+ logEntryEngine("Axis::terminate")
uninitialize_module();
-
+
logExit()
}
void Axis::AxisDelete(void *pValue, XSDTYPE type)
{
- logEntryEngine("Axis::AxisDelete")
+ logEntryEngine("Axis::AxisDelete")
if (pValue == NULL)
return;
switch (type)
{
- case XSD_STRING:
- {
- delete [] (xsd__string) pValue;
- break;
- }
- case XSD_NORMALIZEDSTRING:
- {
- delete [] (xsd__normalizedString) pValue;
- break;
- }
+ case XSD_STRING:
+ {
+ delete [] (xsd__string) pValue;
+ break;
+ }
+ case XSD_NORMALIZEDSTRING:
+ {
+ delete [] (xsd__normalizedString) pValue;
+ break;
+ }
case XSD_FLOAT:
{
delete (xsd__float*) pValue;
@@ -618,7 +618,7 @@
{
delete (xsd__double*) pValue;
break;
- }
+ }
case XSD_DURATION:
{
delete (xsd__duration*) pValue;
@@ -761,7 +761,7 @@
{
delete [] (xsd__anyType) pValue;
break;
- }
+ }
case XSD_ANY:
case ATTACHMENT:
case XSD_UNKNOWN:
@@ -774,12 +774,12 @@
bool Axis::isRunning()
{
- return g_isRunning;
+ return g_isRunning;
}
void Axis::stopAxis()
{
- logEntryEngine("Axis::stopAxis")
+ logEntryEngine("Axis::stopAxis")
start_initializing();
g_isRunning = false;
@@ -791,34 +791,34 @@
int Axis::
startTrace(const char* logFilePath, const char *logFilter)
{
- AxisTrace::setLogFilter(logFilter);
- return AxisTrace::startTrace(logFilePath);
+ AxisTrace::setLogFilter(logFilter);
+ return AxisTrace::startTrace(logFilePath);
}
void Axis::
stopTrace()
{
- AxisTrace::stopTrace();
+ AxisTrace::stopTrace();
}
void Axis::
writeTrace(AXIS_TRACE_TYPE type, const char* functionName, const char * fmt, ...)
{
- // If logging is not enabled, just return.
- if (!AxisTrace::isLoggingEnabled() || !AxisTrace::isStubLoggingEnabled())
- return;
-
+ // If logging is not enabled, just return.
+ if (!AxisTrace::isLoggingEnabled() || !AxisTrace::isStubLoggingEnabled())
+ return;
+
// Construct final formatter
string myfmt;
string blank = " ";
char *traceType = TRACE_TYPE_DEBUG;
if (type == AXIS_TRACE_TYPE_ENTRY)
- traceType = TRACE_TYPE_ENTRY;
+ traceType = TRACE_TYPE_ENTRY;
else if (type == AXIS_TRACE_TYPE_EXIT)
- traceType = TRACE_TYPE_EXIT;
+ traceType = TRACE_TYPE_EXIT;
else if (type == AXIS_TRACE_TYPE_EXCEPTION)
- traceType = TRACE_TYPE_EXCEPT;
+ traceType = TRACE_TYPE_EXCEPT;
if (NULL == fmt)
fmt = "";
Modified: webservices/axis/trunk/c/src/engine/AxisEngine.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/AxisEngine.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/AxisEngine.cpp (original)
+++ webservices/axis/trunk/c/src/engine/AxisEngine.cpp Tue Dec 2 21:27:36 2008
@@ -38,7 +38,7 @@
AxisEngine::AxisEngine ()
{
- logEntryEngine("AxisEngine::AxisEngine")
+ logEntryEngine("AxisEngine::AxisEngine")
m_pSZ = NULL;
m_pDZ = NULL;
@@ -55,7 +55,7 @@
AxisEngine::~AxisEngine ()
{
- logEntryEngine("AxisEngine::~AxisEngine")
+ logEntryEngine("AxisEngine::~AxisEngine")
if (m_pDZ)
g_pDeserializerPool->putInstance (m_pDZ);
@@ -69,13 +69,13 @@
int AxisEngine::initialize ()
{
- logEntryEngine("AxisEngine::initialize")
+ logEntryEngine("AxisEngine::initialize")
int Status = AXIS_SUCCESS;
-
+
m_pMsgData = new MessageData ();
if (!m_pMsgData)
- Status = AXIS_FAIL;
+ Status = AXIS_FAIL;
// Create and initialize Serializer and Deserializer objects
if (AXIS_SUCCESS == Status)
@@ -86,46 +86,46 @@
if (AXIS_SUCCESS == Status)
{
- m_pMsgData->setSerializer (m_pSZ);
- m_pMsgData->setDeSerializer (m_pDZ);
+ m_pMsgData->setSerializer (m_pSZ);
+ m_pMsgData->setDeSerializer (m_pDZ);
}
- logExitWithReturnCode(Status)
+ logExitWithReturnCode(Status)
return Status;
}
void AxisEngine::unInitialize ()
{
- logEntryEngine("AxisEngine::unInitialize")
+ logEntryEngine("AxisEngine::unInitialize")
if (m_pMsgData)
{
delete m_pMsgData;
m_pMsgData = NULL;
}
-
+
logExit()
}
int AxisEngine::initializeHandlers (string & sSessionId, AXIS_PROTOCOL_TYPE protocol)
{
- logEntryEngine("AxisEngine::initializeHandlers")
+ logEntryEngine("AxisEngine::initializeHandlers")
int Status;
-
+
// Get Global Handlers from the pool if configured any
- Status = g_pHandlerPool->getGlobalRequestFlowHandlerChain (&m_pGReqFChain, sSessionId);
- if (AXIS_SUCCESS == Status)
- Status = g_pHandlerPool->getGlobalResponseFlowHandlerChain (&m_pGResFChain, sSessionId);
+ Status = g_pHandlerPool->getGlobalRequestFlowHandlerChain (&m_pGReqFChain, sSessionId);
+ if (AXIS_SUCCESS == Status)
+ Status = g_pHandlerPool->getGlobalResponseFlowHandlerChain (&m_pGResFChain, sSessionId);
// Get Transport Handlers from the pool if configured any
- if (AXIS_SUCCESS == Status)
- Status = g_pHandlerPool->getTransportRequestFlowHandlerChain (&m_pTReqFChain, sSessionId, protocol);
- if (AXIS_SUCCESS == Status)
+ if (AXIS_SUCCESS == Status)
+ Status = g_pHandlerPool->getTransportRequestFlowHandlerChain (&m_pTReqFChain, sSessionId, protocol);
+ if (AXIS_SUCCESS == Status)
Status = g_pHandlerPool->getTransportResponseFlowHandlerChain (&m_pTResFChain, sSessionId, protocol);
- logExitWithReturnCode(Status)
+ logExitWithReturnCode(Status)
return Status;
}
Modified: webservices/axis/trunk/c/src/engine/DeserializerPool.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/DeserializerPool.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/DeserializerPool.cpp (original)
+++ webservices/axis/trunk/c/src/engine/DeserializerPool.cpp Tue Dec 2 21:27:36 2008
@@ -34,35 +34,35 @@
DeserializerPool::DeserializerPool()
{
- m_DZList.clear();
+ m_DZList.clear();
}
DeserializerPool::~DeserializerPool ()
{
- logEntryEngine("DeserializerPool::~DeserializerPool")
+ logEntryEngine("DeserializerPool::~DeserializerPool")
list<IWrapperSoapDeSerializer*>::iterator it = m_DZList.begin();
- while (it != m_DZList.end())
+ while (it != m_DZList.end())
{
- IWrapperSoapDeSerializer *dz = *it;
+ IWrapperSoapDeSerializer *dz = *it;
- if (NULL != dz)
- delete dz;
- it++;
+ if (NULL != dz)
+ delete dz;
+ it++;
}
- m_DZList.clear();
-
+ m_DZList.clear();
+
logExit()
}
int DeserializerPool::getInstance (IWrapperSoapDeSerializer** ppDZ)
{
- logEntryEngine("DeserializerPool::getInstance")
-
+ logEntryEngine("DeserializerPool::getInstance")
+
int Status = AXIS_SUCCESS;
- Lock l(this);
+ Lock l(this);
if (!m_DZList.empty ())
{
*ppDZ = m_DZList.front ();
@@ -79,26 +79,26 @@
}
}
- logExitWithReturnCode(Status)
+ logExitWithReturnCode(Status)
return Status;
}
int DeserializerPool::putInstance (IWrapperSoapDeSerializer* pDZ)
{
- logEntryEngine("DeserializerPool::putInstance")
-
+ logEntryEngine("DeserializerPool::putInstance")
+
int Status = ((SoapDeSerializer*)pDZ)->init ();
if (AXIS_SUCCESS == Status)
{
- Lock l(this);
+ Lock l(this);
m_DZList.push_back (pDZ);
}
else
delete pDZ;
- logExitWithReturnCode(Status)
+ logExitWithReturnCode(Status)
return Status;
}
Modified: webservices/axis/trunk/c/src/engine/HandlerChain.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/HandlerChain.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/HandlerChain.cpp (original)
+++ webservices/axis/trunk/c/src/engine/HandlerChain.cpp Tue Dec 2 21:27:36 2008
@@ -45,7 +45,7 @@
int HandlerChain::
invoke (void* pMsg)
{
- logEntryEngine("HandlerChain::invoke")
+ logEntryEngine("HandlerChain::invoke")
int Status=AXIS_SUCCESS;
@@ -62,7 +62,7 @@
{
logDebugArg1("Calling invoke() method for handler %p", pHandler->_object)
- Status = ((Handler *) (pHandler->_object))->invoke (pMsg);
+ Status = ((Handler *) (pHandler->_object))->invoke (pMsg);
logDebugArg2("Returned from invoke() method for handler %p with status=%d", pHandler->_object, Status)
@@ -76,7 +76,7 @@
}
}
- logExitWithReturnCode(Status)
+ logExitWithReturnCode(Status)
return Status;
}
@@ -84,7 +84,7 @@
void HandlerChain::
onFault (void* pMsg)
{
- logEntryEngine("HandlerChain::onFault")
+ logEntryEngine("HandlerChain::onFault")
while (m_itCurrHandler != m_HandlerList.begin ())
{
@@ -98,14 +98,14 @@
m_itCurrHandler--;
}
-
- logExit()
+
+ logExit()
}
int HandlerChain::
addHandler (BasicHandler* pHandler, int nScope, int nLibId)
{
- logEntryEngine("HandlerChain::addHandler")
+ logEntryEngine("HandlerChain::addHandler")
ChainItem item;
item.m_pHandler = pHandler;
@@ -113,7 +113,7 @@
item.m_nLibId = nLibId;
m_HandlerList.push_back (item);
- logExitWithReturnCode(AXIS_SUCCESS)
+ logExitWithReturnCode(AXIS_SUCCESS)
return AXIS_SUCCESS;
}
Modified: webservices/axis/trunk/c/src/engine/HandlerLoader.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/HandlerLoader.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/HandlerLoader.cpp (original)
+++ webservices/axis/trunk/c/src/engine/HandlerLoader.cpp Tue Dec 2 21:27:36 2008
@@ -45,10 +45,10 @@
HandlerLoader::
~HandlerLoader ()
{
- logEntryEngine("HandlerLoader::~HandlerLoader")
+ logEntryEngine("HandlerLoader::~HandlerLoader")
//lock ();
- Lock l(this);
+ Lock l(this);
HandlerInformation* pHandlerInfo = NULL;
for (map < int, HandlerInformation* >::iterator it =
m_HandlerInfoList.begin (); it != m_HandlerInfoList.end (); it++)
@@ -57,7 +57,7 @@
unloadLib (pHandlerInfo);
delete pHandlerInfo;
}
- l.unlock ();
+ l.unlock ();
PLATFORM_LOADLIBEXIT()
logExit()
@@ -66,9 +66,9 @@
int HandlerLoader::
deleteHandler (BasicHandler* pHandler, int nLibId)
{
- logEntryEngine("HandlerLoader::deleteHandler")
+ logEntryEngine("HandlerLoader::deleteHandler")
- Lock l(this);
+ Lock l(this);
if (m_HandlerInfoList.find (nLibId) != m_HandlerInfoList.end ())
{
HandlerInformation* pHandlerInfo = m_HandlerInfoList[nLibId];
@@ -77,12 +77,12 @@
}
else
{
- logThrowException("AxisEngineException - SERVER_ENGINE_HANDLER_NOT_LOADED")
+ logThrowException("AxisEngineException - SERVER_ENGINE_HANDLER_NOT_LOADED")
throw AxisEngineException(SERVER_ENGINE_HANDLER_NOT_LOADED);
}
- logExitWithReturnCode(AXIS_SUCCESS)
+ logExitWithReturnCode(AXIS_SUCCESS)
return AXIS_SUCCESS;
}
@@ -90,7 +90,7 @@
int HandlerLoader::
loadLib (HandlerInformation* pHandlerInfo)
{
- logEntryEngine("HandlerLoader::loadLib")
+ logEntryEngine("HandlerLoader::loadLib")
logDebugArg1("Loading handler %s", pHandlerInfo->m_sLib.c_str())
@@ -115,24 +115,24 @@
int HandlerLoader::
unloadLib (HandlerInformation* pHandlerInfo)
{
- logEntryEngine("HandlerLoader::unloadLib")
+ logEntryEngine("HandlerLoader::unloadLib")
logDebugArg1("Unloading handler %s", pHandlerInfo->m_sLib.c_str())
PLATFORM_UNLOADLIB(pHandlerInfo->m_Handler);
- logExitWithReturnCode(AXIS_SUCCESS)
-
+ logExitWithReturnCode(AXIS_SUCCESS)
+
return AXIS_SUCCESS;
}
int HandlerLoader::
createHandler (BasicHandler** pHandler, int nLibId)
{
- logEntryEngine("HandlerLoader::createHandler")
+ logEntryEngine("HandlerLoader::createHandler")
//lock ();
- Lock l(this);
+ Lock l(this);
*pHandler = NULL;
HandlerInformation* pHandlerInfo = NULL;
if (m_HandlerInfoList.find (nLibId) == m_HandlerInfoList.end ())
Modified: webservices/axis/trunk/c/src/engine/HandlerLoader.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/HandlerLoader.h?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/HandlerLoader.h (original)
+++ webservices/axis/trunk/c/src/engine/HandlerLoader.h Tue Dec 2 21:27:36 2008
@@ -45,15 +45,15 @@
//status codes
-/*#define HANDLER_INIT_FAIL 1
-#define CREATION_FAILED 2
-#define LOADLIBRARY_FAILED 3
-#define LIBRARY_PATH_EMPTY 4
-#define HANDLER_NOT_LOADED 5
-#define HANDLER_BEING_USED 6
-#define GET_HANDLER_FAILED 7
-#define WRONG_HANDLER_TYPE 8
-#define NO_HANDLERS_CONFIGURED 9
+/*#define HANDLER_INIT_FAIL 1
+#define CREATION_FAILED 2
+#define LOADLIBRARY_FAILED 3
+#define LIBRARY_PATH_EMPTY 4
+#define HANDLER_NOT_LOADED 5
+#define HANDLER_BEING_USED 6
+#define GET_HANDLER_FAILED 7
+#define WRONG_HANDLER_TYPE 8
+#define NO_HANDLERS_CONFIGURED 9
*/
/*
* @class HandlerLoader
Modified: webservices/axis/trunk/c/src/engine/HandlerPool.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/HandlerPool.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/HandlerPool.cpp (original)
+++ webservices/axis/trunk/c/src/engine/HandlerPool.cpp Tue Dec 2 21:27:36 2008
@@ -47,20 +47,20 @@
HandlerPool::
~HandlerPool ()
{
- logEntryEngine("HandlerPool::~HandlerPool")
+ logEntryEngine("HandlerPool::~HandlerPool")
for (list <HandlerChain*>::iterator it = m_ChainStore.begin (); it != m_ChainStore.end (); it++)
{
delete (*it);
}
-
+
logExit()
}
int HandlerPool::
getHandler (BasicHandler** ppHandler, string & sSessionId, int nScope, int nLibId)
{
- logEntryEngine("HandlerPool::getHandler")
+ logEntryEngine("HandlerPool::getHandler")
*ppHandler = NULL;
int Status = AXIS_FAIL;
@@ -70,12 +70,12 @@
case AH_APPLICATION:
do
{
- Status = g_pAppScopeHandlerPool->getInstance (ppHandler, nLibId);
+ Status = g_pAppScopeHandlerPool->getInstance (ppHandler, nLibId);
if (AXIS_SUCCESS == Status)
- break;
+ break;
else if (Status == SERVER_ENGINE_HANDLER_BEING_USED)
{
- //block this thread not this object
+ //block this thread not this object
PLATFORM_SLEEP(0);
}
else
@@ -86,23 +86,23 @@
break;
case AH_SESSION:
- Status = g_pSessionScopeHandlerPool->getInstance (sSessionId, ppHandler, nLibId);
- break;
-
+ Status = g_pSessionScopeHandlerPool->getInstance (sSessionId, ppHandler, nLibId);
+ break;
+
case AH_REQUEST:
- Status = g_pRequestScopeHandlerPool->getInstance (ppHandler, nLibId);
- break;
+ Status = g_pRequestScopeHandlerPool->getInstance (ppHandler, nLibId);
+ break;
}
- logExitWithReturnCode(Status)
-
- return Status;
+ logExitWithReturnCode(Status)
+
+ return Status;
}
int HandlerPool::
poolHandler (string &sSessionId, BasicHandler* pHandler, int nScope, int nLibId, bool bWebService)
{
- logEntryEngine("HandlerPool::poolHandler")
+ logEntryEngine("HandlerPool::poolHandler")
switch (nScope)
{
@@ -116,52 +116,52 @@
g_pRequestScopeHandlerPool->putInstance (pHandler, nLibId, bWebService);
break;
}
-
- logExitWithReturnCode(AXIS_SUCCESS)
-
+
+ logExitWithReturnCode(AXIS_SUCCESS)
+
return AXIS_SUCCESS;
}
int HandlerPool::
getGlobalRequestFlowHandlerChain (HandlerChain** ppChain, string & sSessionId)
{
- logEntryEngine("HandlerPool::getGlobalRequestFlowHandlerChain")
+ logEntryEngine("HandlerPool::getGlobalRequestFlowHandlerChain")
int Status = AXIS_SUCCESS;
const WSDDHandlerList* pHandlerList = g_pWSDDDeployment->getGlobalRequestFlowHandlers ();
if (pHandlerList)
- Status = getHandlerChain (sSessionId, ppChain, pHandlerList);
+ Status = getHandlerChain (sSessionId, ppChain, pHandlerList);
else
*ppChain = NULL;
- logExitWithReturnCode(Status)
-
- return Status;
+ logExitWithReturnCode(Status)
+
+ return Status;
}
int HandlerPool::
getGlobalResponseFlowHandlerChain (HandlerChain** ppChain, string &sSessionId)
{
- logEntryEngine("HandlerPool::getGlobalResponseFlowHandlerChain")
+ logEntryEngine("HandlerPool::getGlobalResponseFlowHandlerChain")
int Status = AXIS_SUCCESS;
const WSDDHandlerList *pHandlerList = g_pWSDDDeployment->getGlobalResponseFlowHandlers ();
if (pHandlerList)
- Status = getHandlerChain (sSessionId, ppChain, pHandlerList);
+ Status = getHandlerChain (sSessionId, ppChain, pHandlerList);
else
*ppChain = NULL;
- logExitWithReturnCode(Status)
-
- return Status;
+ logExitWithReturnCode(Status)
+
+ return Status;
}
int HandlerPool::
getTransportRequestFlowHandlerChain (HandlerChain** ppChain, string &sSessionId, AXIS_PROTOCOL_TYPE Protocol)
{
- logEntryEngine("HandlerPool::getTransportRequestFlowHandlerChain")
+ logEntryEngine("HandlerPool::getTransportRequestFlowHandlerChain")
int Status = AXIS_SUCCESS;
@@ -171,15 +171,15 @@
else
*ppChain = NULL;
- logExitWithReturnCode(Status)
-
- return Status;
+ logExitWithReturnCode(Status)
+
+ return Status;
}
int HandlerPool::
getTransportResponseFlowHandlerChain (HandlerChain** ppChain, string & sSessionId, AXIS_PROTOCOL_TYPE Protocol)
{
- logEntryEngine("HandlerPool::getTransportResponseFlowHandlerChain")
+ logEntryEngine("HandlerPool::getTransportResponseFlowHandlerChain")
int Status = AXIS_SUCCESS;
@@ -189,53 +189,53 @@
else
*ppChain = NULL;
- logExitWithReturnCode(Status)
-
- return Status;
+ logExitWithReturnCode(Status)
+
+ return Status;
}
int HandlerPool::
getRequestFlowHandlerChain (HandlerChain** ppChain, string &sSessionId, const WSDDService* pService)
{
- logEntryEngine("HandlerPool::getRequestFlowHandlerChain")
+ logEntryEngine("HandlerPool::getRequestFlowHandlerChain")
int Status = AXIS_SUCCESS;
const WSDDHandlerList* pHandlerList = pService->getRequestFlowHandlers ();
if (pHandlerList)
- Status = getHandlerChain (sSessionId, ppChain, pHandlerList);
+ Status = getHandlerChain (sSessionId, ppChain, pHandlerList);
else
*ppChain = NULL;
- logExitWithReturnCode(Status)
-
- return Status;
+ logExitWithReturnCode(Status)
+
+ return Status;
}
int HandlerPool::
getResponseFlowHandlerChain (HandlerChain** ppChain, string &sSessionId, const WSDDService* pService)
{
- logEntryEngine("HandlerPool::getResponseFlowHandlerChain")
-
+ logEntryEngine("HandlerPool::getResponseFlowHandlerChain")
+
int Status = AXIS_SUCCESS;
const WSDDHandlerList* pHandlerList = pService->getResponseFlowHandlers ();
if (pHandlerList)
- Status = getHandlerChain (sSessionId, ppChain, pHandlerList);
+ Status = getHandlerChain (sSessionId, ppChain, pHandlerList);
else
*ppChain = NULL;
- logExitWithReturnCode(Status)
-
- return Status;
+ logExitWithReturnCode(Status)
+
+ return Status;
}
int HandlerPool::
getHandlerChain (string &sSessionId, HandlerChain** ppChain, const WSDDHandlerList* pHandlerList)
{
- logEntryEngine("HandlerPool::getHandlerChain")
+ logEntryEngine("HandlerPool::getHandlerChain")
- Lock l(this);
+ Lock l(this);
*ppChain = NULL;
HandlerChain* pChain = NULL;
@@ -301,15 +301,15 @@
else
*ppChain = pChain;
- logExitWithReturnCode(Status)
-
+ logExitWithReturnCode(Status)
+
return Status;
}
void HandlerPool::
poolHandlerChain (HandlerChain* pChain, string &sSessionId)
{
- logEntryEngine("HandlerPool::poolHandlerChain")
+ logEntryEngine("HandlerPool::poolHandlerChain")
for (pChain->m_itCurrHandler = pChain->m_HandlerList.begin ();
pChain->m_itCurrHandler != pChain->m_HandlerList.end ();
@@ -324,7 +324,7 @@
}
pChain->fini ();
- Lock l(this);
+ Lock l(this);
m_ChainStore.push_back (pChain);
logExit()
@@ -333,7 +333,7 @@
int HandlerPool::
getWebService( BasicHandler ** ppHandler, string & sSessionId, const WSDDHandler * pService)
{
- logEntryEngine("HandlerPool::getWebService")
+ logEntryEngine("HandlerPool::getWebService")
int Status = getHandler( ppHandler, sSessionId, pService->getScope(), pService->getLibId());
@@ -353,9 +353,9 @@
}*/
}
else if( NULL == (*ppHandler)->_object)
- {
+ {
Status = AXIS_FAIL;
- }
+ }
else
// C++ web service
{
@@ -371,7 +371,7 @@
}
}
- logExitWithReturnCode(Status)
+ logExitWithReturnCode(Status)
return Status;
}
@@ -379,10 +379,10 @@
void HandlerPool::
poolWebService (string &sSessionId, BasicHandler* pHandler, const WSDDHandler * pHandlerInfo)
{
- logEntryEngine("HandlerPool::poolWebService")
+ logEntryEngine("HandlerPool::poolWebService")
poolHandler (sSessionId, pHandler, pHandlerInfo->getScope (), pHandlerInfo->getLibId (), true);
-
+
logExit()
}
Modified: webservices/axis/trunk/c/src/engine/RequestScopeHandlerPool.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/RequestScopeHandlerPool.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/RequestScopeHandlerPool.cpp (original)
+++ webservices/axis/trunk/c/src/engine/RequestScopeHandlerPool.cpp Tue Dec 2 21:27:36 2008
@@ -41,7 +41,7 @@
RequestScopeHandlerPool::
~RequestScopeHandlerPool ()
{
- logEntryEngine("RequestScopeHandlerPool::~RequestScopeHandlerPool")
+ logEntryEngine("RequestScopeHandlerPool::~RequestScopeHandlerPool")
for (map < int, list <BasicHandler*> >::iterator it = m_Handlers.begin (); it != m_Handlers.end (); it++)
{
@@ -52,7 +52,7 @@
(*it).second.clear ();
}
-
+
m_Handlers.clear ();
logExit()
@@ -61,10 +61,10 @@
int RequestScopeHandlerPool::
getInstance (BasicHandler** pHandler, int nLibId)
{
- logEntryEngine("RequestScopeHandlerPool::getInstance")
+ logEntryEngine("RequestScopeHandlerPool::getInstance")
- Lock l(this);
-
+ Lock l(this);
+
int Status = AXIS_SUCCESS;
if (m_Handlers.find (nLibId) != m_Handlers.end ())
@@ -88,7 +88,7 @@
m_Handlers[nLibId].clear ();
}
- logExitWithReturnCode(Status)
+ logExitWithReturnCode(Status)
return Status;
}
@@ -96,9 +96,9 @@
int RequestScopeHandlerPool::
putInstance (BasicHandler* pHandler, int nLibId, bool bWebService)
{
- logEntryEngine("RequestScopeHandlerPool::putInstance")
+ logEntryEngine("RequestScopeHandlerPool::putInstance")
- Lock l(this);
+ Lock l(this);
if (0 != pHandler->_functions)
{
@@ -112,7 +112,7 @@
m_Handlers[nLibId].push_back (pHandler);
- logExitWithReturnCode(AXIS_SUCCESS)
+ logExitWithReturnCode(AXIS_SUCCESS)
return AXIS_SUCCESS;
}
Modified: webservices/axis/trunk/c/src/engine/SOAPTransportFactory.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/SOAPTransportFactory.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/SOAPTransportFactory.cpp (original)
+++ webservices/axis/trunk/c/src/engine/SOAPTransportFactory.cpp Tue Dec 2 21:27:36 2008
@@ -41,13 +41,13 @@
SOAPTransportFactory::
SOAPTransportFactory()
{
- m_LibHandler = 0;
+ m_LibHandler = 0;
}
SOAPTransportFactory::
~SOAPTransportFactory()
{
- logEntryEngine("SOAPTransportFactory::~SOAPTransportFactory")
+ logEntryEngine("SOAPTransportFactory::~SOAPTransportFactory")
logExit()
}
@@ -55,12 +55,12 @@
int SOAPTransportFactory::
initialize()
{
- logEntryEngine("SOAPTransportFactory::initialize")
+ logEntryEngine("SOAPTransportFactory::initialize")
- m_pcLibraryPath = g_pConfig->getAxisConfProperty(AXCONF_TRANSPORTHTTP);
+ m_pcLibraryPath = g_pConfig->getAxisConfProperty(AXCONF_TRANSPORTHTTP);
- if (!loadLib())
- {
+ if (!loadLib())
+ {
m_Create = (CREATE_OBJECT1) PLATFORM_GETPROCADDR(m_LibHandler, CREATE_FUNCTION1);
if (m_Create)
m_Delete = (DELETE_OBJECT1) PLATFORM_GETPROCADDR(m_LibHandler, DELETE_FUNCTION1);
@@ -79,23 +79,23 @@
throw AxisEngineException(SERVER_ENGINE_LOADING_TRANSPORT_FAILED, sFullMessage.c_str());
}
- void (*preloadChannels) (char*, char*);
- preloadChannels = (void (*)(char*, char*))PLATFORM_GETPROCADDR(m_LibHandler, "preloadChannels");
- if (preloadChannels)
- (*preloadChannels)(g_pConfig->getAxisConfProperty( AXCONF_CHANNEL_HTTP),
- g_pConfig->getAxisConfProperty( AXCONF_SSLCHANNEL_HTTP));
- }
- else
- {
+ void (*preloadChannels) (char*, char*);
+ preloadChannels = (void (*)(char*, char*))PLATFORM_GETPROCADDR(m_LibHandler, "preloadChannels");
+ if (preloadChannels)
+ (*preloadChannels)(g_pConfig->getAxisConfProperty( AXCONF_CHANNEL_HTTP),
+ g_pConfig->getAxisConfProperty( AXCONF_SSLCHANNEL_HTTP));
+ }
+ else
+ {
// dead code - will never be reached, need to remove.
- logThrowException("AxisEngineException - SERVER_ENGINE_LOADING_TRANSPORT_FAILED")
+ logThrowException("AxisEngineException - SERVER_ENGINE_LOADING_TRANSPORT_FAILED")
throw AxisEngineException(SERVER_ENGINE_LOADING_TRANSPORT_FAILED);
- }
-
- logExitWithReturnCode(AXIS_SUCCESS)
-
- return AXIS_SUCCESS;
+ }
+
+ logExitWithReturnCode(AXIS_SUCCESS)
+
+ return AXIS_SUCCESS;
}
int SOAPTransportFactory::
@@ -121,37 +121,37 @@
SOAPTransport* SOAPTransportFactory::
getTransportObject(AXIS_PROTOCOL_TYPE eProtocol)
{
- logEntryEngine("SOAPTransportFactory::getTransportObject")
+ logEntryEngine("SOAPTransportFactory::getTransportObject")
- SOAPTransport* pTpt = NULL;
- m_Create(&pTpt);
-
- if (pTpt)
- {
+ SOAPTransport* pTpt = NULL;
+ m_Create(&pTpt);
+
+ if (pTpt)
+ {
pTpt->setProtocol(eProtocol);
if (AxisTrace::isTransportLoggingEnabled())
- pTpt->enableTrace(AxisTrace::getLogFilePath().c_str(), AxisTrace::getLogFilter().c_str());
- }
+ pTpt->enableTrace(AxisTrace::getLogFilePath().c_str(), AxisTrace::getLogFilter().c_str());
+ }
logExitWithPointer(pTpt)
- return pTpt;
+ return pTpt;
}
void SOAPTransportFactory::
destroyTransportObject(SOAPTransport* pObject)
{
- logEntryEngine("SOAPTransportFactory::destroyTransportObject")
+ logEntryEngine("SOAPTransportFactory::destroyTransportObject")
- m_Delete(pObject);
-
+ m_Delete(pObject);
+
logExit()
}
int SOAPTransportFactory::
loadLib()
{
- logEntryEngine("SOAPTransportFactory::loadLib")
+ logEntryEngine("SOAPTransportFactory::loadLib")
logDebugArg1("Loading transport %s", m_pcLibraryPath)
@@ -168,22 +168,22 @@
throw AxisEngineException(SERVER_ENGINE_LOADING_TRANSPORT_FAILED, sFullMessage.c_str());
}
- logExitWithReturnCode(AXIS_SUCCESS)
-
+ logExitWithReturnCode(AXIS_SUCCESS)
+
return AXIS_SUCCESS;
}
int SOAPTransportFactory::
unloadLib()
{
- logEntryEngine("SOAPTransportFactory::unloadLib")
+ logEntryEngine("SOAPTransportFactory::unloadLib")
logDebugArg1("Unloading transport %s", m_pcLibraryPath)
PLATFORM_UNLOADLIB(m_LibHandler);
- logExitWithReturnCode(AXIS_SUCCESS)
-
+ logExitWithReturnCode(AXIS_SUCCESS)
+
return AXIS_SUCCESS;
}
Modified: webservices/axis/trunk/c/src/engine/SOAPTransportFactory.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/SOAPTransportFactory.h?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/SOAPTransportFactory.h (original)
+++ webservices/axis/trunk/c/src/engine/SOAPTransportFactory.h Tue Dec 2 21:27:36 2008
@@ -54,9 +54,9 @@
class SOAPTransportFactory
{
public:
- SOAPTransportFactory();
- virtual ~SOAPTransportFactory();
- /**
+ SOAPTransportFactory();
+ virtual ~SOAPTransportFactory();
+ /**
* Used to initialize the global object. Following tasks are done
* 1. Get the transport library name(s) from the configuration file.
* 2. Load those dynamic transport libraries.
@@ -64,24 +64,24 @@
* 4. Get any other information about the library. (ex: what protocols
* are supported etc)
*/
- static int initialize();
- /**
- * Used to uninitialize the global object.
- * 1. Unloads all dynamic transport libraries.
- */
- static int uninitialize();
- /**
- * Used to create a transport object of given protocol
- */
- static SOAPTransport* getTransportObject(AXIS_PROTOCOL_TYPE eProtocol);
- static void destroyTransportObject(SOAPTransport* pObject);
+ static int initialize();
+ /**
+ * Used to uninitialize the global object.
+ * 1. Unloads all dynamic transport libraries.
+ */
+ static int uninitialize();
+ /**
+ * Used to create a transport object of given protocol
+ */
+ static SOAPTransport* getTransportObject(AXIS_PROTOCOL_TYPE eProtocol);
+ static void destroyTransportObject(SOAPTransport* pObject);
- static int loadLib();
- static int unloadLib();
+ static int loadLib();
+ static int unloadLib();
private:
- static const char* m_pcLibraryPath;
- static DLHandler m_LibHandler;
+ static const char* m_pcLibraryPath;
+ static DLHandler m_LibHandler;
static CREATE_OBJECT1 m_Create;
static DELETE_OBJECT1 m_Delete;
};
Modified: webservices/axis/trunk/c/src/engine/SerializerPool.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/SerializerPool.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/SerializerPool.cpp (original)
+++ webservices/axis/trunk/c/src/engine/SerializerPool.cpp Tue Dec 2 21:27:36 2008
@@ -32,7 +32,7 @@
SerializerPool::
SerializerPool ()
{
- logEntryEngine("SerializerPool::SerializerPool")
+ logEntryEngine("SerializerPool::SerializerPool")
logExit()
}
@@ -40,14 +40,14 @@
SerializerPool::
~SerializerPool ()
{
- logEntryEngine("SerializerPool::~SerializerPool")
+ logEntryEngine("SerializerPool::~SerializerPool")
for (list <IWrapperSoapSerializer*>::iterator it = m_SZList.begin ();
it != m_SZList.end (); it++)
{
delete (*it);
}
-
+
logExit()
}
@@ -55,11 +55,11 @@
int SerializerPool::
getInstance (IWrapperSoapSerializer** ppSZ)
{
- logEntryEngine("SerializerPool::getInstance")
+ logEntryEngine("SerializerPool::getInstance")
- Lock l(this);
-
- int Status = AXIS_SUCCESS;
+ Lock l(this);
+
+ int Status = AXIS_SUCCESS;
if (!m_SZList.empty ())
{
@@ -75,7 +75,7 @@
#endif
}
-
+
if (AXIS_SUCCESS != ((SoapSerializer*)(*ppSZ))->init ())
{
delete *ppSZ;
@@ -83,21 +83,21 @@
Status = AXIS_FAIL;
}
- logExitWithReturnCode(Status)
-
+ logExitWithReturnCode(Status)
+
return Status;
}
int SerializerPool::
putInstance (IWrapperSoapSerializer* pSZ)
{
- logEntryEngine("SerializerPool::putInstance")
+ logEntryEngine("SerializerPool::putInstance")
- Lock l(this);
+ Lock l(this);
m_SZList.push_back (pSZ);
- logExitWithReturnCode(AXIS_SUCCESS)
+ logExitWithReturnCode(AXIS_SUCCESS)
return AXIS_SUCCESS;
}
Modified: webservices/axis/trunk/c/src/engine/SharedObject.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/SharedObject.h?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/SharedObject.h (original)
+++ webservices/axis/trunk/c/src/engine/SharedObject.h Tue Dec 2 21:27:36 2008
@@ -46,20 +46,20 @@
int lock ();
protected:
- class Lock
- {
- public:
- inline Lock();
- inline Lock(SharedObject *obj);
- inline ~Lock();
- inline void unlock();
-
- private:
- SharedObject *m_locked;
- };
+ class Lock
+ {
+ public:
+ inline Lock();
+ inline Lock(SharedObject *obj);
+ inline ~Lock();
+ inline void unlock();
+
+ private:
+ SharedObject *m_locked;
+ };
-
- private:
+
+ private:
bool m_bLocked;
#ifdef WIN32
HANDLE mut;
Modified: webservices/axis/trunk/c/src/engine/XMLParserFactory.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/XMLParserFactory.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/XMLParserFactory.cpp (original)
+++ webservices/axis/trunk/c/src/engine/XMLParserFactory.cpp Tue Dec 2 21:27:36 2008
@@ -39,26 +39,26 @@
XMLParserFactory::
XMLParserFactory()
{
- m_LibHandler = 0;
+ m_LibHandler = 0;
}
XMLParserFactory::
~XMLParserFactory()
{
- logEntryEngine("XMLParserFactory::~XMLParserFactory")
-
- logExit()
+ logEntryEngine("XMLParserFactory::~XMLParserFactory")
+
+ logExit()
}
int XMLParserFactory::
initialize()
{
- logEntryEngine("XMLParserFactory::initialize")
+ logEntryEngine("XMLParserFactory::initialize")
m_pcLibraryPath = g_pConfig->getAxisConfProperty(AXCONF_XMLPARSER);
- if (!loadLib())
- {
+ if (!loadLib())
+ {
m_Create = (CREATE_OBJECT2) PLATFORM_GETPROCADDR(m_LibHandler, CREATE_FUNCTION2);
if (m_Create)
m_Delete = (DELETE_OBJECT2) PLATFORM_GETPROCADDR(m_LibHandler, DELETE_FUNCTION2);
@@ -76,30 +76,30 @@
throw AxisEngineException(SERVER_ENGINE_LOADING_PARSER_FAILED, sFullMessage.c_str());
}
- }
- else
- {
+ }
+ else
+ {
// dead code - will never be reached, need to remove.
- logThrowException("AxisEngineException - SERVER_ENGINE_LOADING_PARSER_FAILED")
-
+ logThrowException("AxisEngineException - SERVER_ENGINE_LOADING_PARSER_FAILED")
+
throw AxisEngineException(SERVER_ENGINE_LOADING_PARSER_FAILED);
- }
-
- logExitWithReturnCode(AXIS_SUCCESS)
+ }
+
+ logExitWithReturnCode(AXIS_SUCCESS)
- return AXIS_SUCCESS;
+ return AXIS_SUCCESS;
}
int XMLParserFactory::
uninitialize()
{
- logEntryEngine("XMLParserFactory::uninitialize")
+ logEntryEngine("XMLParserFactory::uninitialize")
- int Status = unloadLib();
-
- logExitWithReturnCode(Status)
-
- return Status;
+ int Status = unloadLib();
+
+ logExitWithReturnCode(Status)
+
+ return Status;
}
/**
@@ -108,37 +108,37 @@
XMLParser* XMLParserFactory::
getParserObject()
{
- logEntryEngine("XMLParserFactory::getParserObject")
+ logEntryEngine("XMLParserFactory::getParserObject")
- XMLParser* pTpt = 0;
- if (m_Create)
- m_Create(&pTpt);
-
- if (pTpt)
- {
+ XMLParser* pTpt = 0;
+ if (m_Create)
+ m_Create(&pTpt);
+
+ if (pTpt)
+ {
if (AxisTrace::isParserLoggingEnabled())
- pTpt->enableTrace(AxisTrace::getLogFilePath().c_str(), AxisTrace::getLogFilter().c_str());
- }
-
+ pTpt->enableTrace(AxisTrace::getLogFilePath().c_str(), AxisTrace::getLogFilter().c_str());
+ }
+
logExitWithPointer(pTpt)
- return pTpt;
+ return pTpt;
}
void XMLParserFactory::
destroyParserObject(XMLParser* pObject)
{
- logEntryEngine("XMLParserFactory::destroyParserObject")
+ logEntryEngine("XMLParserFactory::destroyParserObject")
- m_Delete(pObject);
-
+ m_Delete(pObject);
+
logExit()
}
int XMLParserFactory::
loadLib()
{
- logEntryEngine("XMLParserFactory::loadLib")
+ logEntryEngine("XMLParserFactory::loadLib")
logDebugArg1("Loading parser %s", m_pcLibraryPath)
@@ -155,7 +155,7 @@
throw AxisEngineException(SERVER_ENGINE_LOADING_PARSER_FAILED, sFullMessage.c_str());
}
- logExitWithReturnCode(AXIS_SUCCESS)
+ logExitWithReturnCode(AXIS_SUCCESS)
return AXIS_SUCCESS;
}
@@ -163,13 +163,13 @@
int XMLParserFactory::
unloadLib()
{
- logEntryEngine("XMLParserFactory::unloadLib")
+ logEntryEngine("XMLParserFactory::unloadLib")
logDebugArg1("Unloading parser %s", m_pcLibraryPath)
PLATFORM_UNLOADLIB(m_LibHandler);
- logExitWithReturnCode(AXIS_SUCCESS)
+ logExitWithReturnCode(AXIS_SUCCESS)
return AXIS_SUCCESS;
}
Modified: webservices/axis/trunk/c/src/engine/XMLParserFactory.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/XMLParserFactory.h?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/XMLParserFactory.h (original)
+++ webservices/axis/trunk/c/src/engine/XMLParserFactory.h Tue Dec 2 21:27:36 2008
@@ -46,36 +46,36 @@
class XMLParserFactory
{
public:
- XMLParserFactory();
- virtual ~XMLParserFactory();
- /**
+ XMLParserFactory();
+ virtual ~XMLParserFactory();
+ /**
* Used to initialize the global object. Following tasks are done
* 1. Get the parser library name from the configuration file.
* 2. Load that dynamic parser library.
* 3. Get the function pointers of the exported functions
* 4. Get any other information about the library.
*/
- static int initialize();
- /**
- * Used to uninitialize the global object.
- * 1. Unloads dynamic parser library.
- */
- static int uninitialize();
- /**
- * Used to create a parser object
- */
- static XMLParser* getParserObject();
- /**
- * Destroys the parser object
- */
- static void destroyParserObject(XMLParser* pObject);
+ static int initialize();
+ /**
+ * Used to uninitialize the global object.
+ * 1. Unloads dynamic parser library.
+ */
+ static int uninitialize();
+ /**
+ * Used to create a parser object
+ */
+ static XMLParser* getParserObject();
+ /**
+ * Destroys the parser object
+ */
+ static void destroyParserObject(XMLParser* pObject);
- static int loadLib();
- static int unloadLib();
+ static int loadLib();
+ static int unloadLib();
private:
- static const char* m_pcLibraryPath;
- static DLHandler m_LibHandler;
+ static const char* m_pcLibraryPath;
+ static DLHandler m_LibHandler;
static CREATE_OBJECT2 m_Create;
static DELETE_OBJECT2 m_Delete;
Modified: webservices/axis/trunk/c/src/engine/client/Call.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/client/Call.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/client/Call.cpp (original)
+++ webservices/axis/trunk/c/src/engine/client/Call.cpp Tue Dec 2 21:27:36 2008
@@ -60,7 +60,7 @@
initialize_module (0);
// This needs to be here, after the initialize_module, otherwise, trace filter is not honored.
- logEntryEngine("Call::Call")
+ logEntryEngine("Call::Call")
m_pTransport = NULL;
m_nTransportType = APTHTTP1_1;
@@ -103,9 +103,9 @@
Call::
~Call ()
{
- logEntryEngine("Call::~Call")
+ logEntryEngine("Call::~Call")
- if (m_pAxisEngine)
+ if (m_pAxisEngine)
m_pAxisEngine->unInitialize ();
cleanup();
@@ -163,7 +163,7 @@
const char* pchNamespace,
bool bIsWrapperStyle)
{
- logEntryEngine("Call::setOperation")
+ logEntryEngine("Call::setOperation")
m_pIWSSZ->createSoapMethod (pchOperation, pchNamespace);
m_pAxisEngine->getMessageData()->setOperationName(pchOperation);
@@ -215,7 +215,7 @@
int Call::sendAndReceive()
{
- logEntryEngine("Call::sendAndReceive")
+ logEntryEngine("Call::sendAndReceive")
m_nStatus = m_pAxisEngine->process( m_pTransport, false);
@@ -226,7 +226,7 @@
int Call::send()
{
- logEntryEngine("Call::send")
+ logEntryEngine("Call::send")
m_nStatus = m_pAxisEngine->process( m_pTransport, true);
@@ -248,7 +248,7 @@
int Call::initialize( PROVIDERTYPE nStyle)
{
- logEntryEngine("Call::initialize")
+ logEntryEngine("Call::initialize")
m_bCallInitialized = true;
@@ -365,7 +365,7 @@
int Call::unInitialize()
{
- logEntryEngine("Call::unInitialize")
+ logEntryEngine("Call::unInitialize")
m_bCallInitialized = false;
@@ -443,7 +443,7 @@
int Call::setTransportProperty( AXIS_TRANSPORT_INFORMATION_TYPE type, const char* value)
{
- logEntryEngine("Call::setTransportProperty")
+ logEntryEngine("Call::setTransportProperty")
int iSuccess = AXIS_SUCCESS;
@@ -471,7 +471,7 @@
if( iSuccess < 0)
{
- logThrowExceptionWithData("AxisGenException", m_pTransport->getLastChannelError())
+ logThrowExceptionWithData("AxisGenException", m_pTransport->getLastChannelError())
throw AxisGenException( -iSuccess, m_pTransport->getLastChannelError());
}
@@ -1071,15 +1071,15 @@
}
int Call::validateMessage( const AxisChar * pName,
- const AxisChar * pNamespace,
- bool consumeIt)
+ const AxisChar * pNamespace,
+ bool consumeIt)
{
return m_pIWSDZ->validateMessageBody( pName, pNamespace, consumeIt);
}
void Call::getChardataAs(void** pValue, XSDTYPE type)
{
- m_pIWSDZ->getChardataAs( pValue, type);
+ m_pIWSDZ->getChardataAs( pValue, type);
}
void* Call::checkFault (const AxisChar* pName, const AxisChar* pNamespace)
@@ -1235,7 +1235,7 @@
void Call::processSoapFault(AxisException *e,
void *exceptionHandlerFp)
{
- logEntryEngine("Call::processSoapFault")
+ logEntryEngine("Call::processSoapFault")
AXIS_EXCEPTION_HANDLER_FUNCT excFp = (AXIS_EXCEPTION_HANDLER_FUNCT)exceptionHandlerFp;
ISoapFault* pSoapFault = NULL;
@@ -1246,9 +1246,9 @@
if(pSoapFault)
{
- void *pFaultDetail = NULL;
- bool faultIsDefined = false;
- bool isFaultDetailXMLString = false;
+ void *pFaultDetail = NULL;
+ bool faultIsDefined = false;
+ bool isFaultDetailXMLString = false;
FaultInformation_t *fi;
const char* pcCmplxFaultName = pSoapFault->getCmplxFaultObjectName();
Modified: webservices/axis/trunk/c/src/engine/client/ClientAxisEngine.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/client/ClientAxisEngine.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/client/ClientAxisEngine.cpp (original)
+++ webservices/axis/trunk/c/src/engine/client/ClientAxisEngine.cpp Tue Dec 2 21:27:36 2008
@@ -43,7 +43,7 @@
ClientAxisEngine::
ClientAxisEngine ()
{
- logEntryEngine("ClientAxisEngine::ClientAxisEngine")
+ logEntryEngine("ClientAxisEngine::ClientAxisEngine")
logExit()
}
@@ -51,8 +51,8 @@
ClientAxisEngine::
~ClientAxisEngine ()
{
- logEntryEngine("ClientAxisEngine::~ClientAxisEngine")
-
+ logEntryEngine("ClientAxisEngine::~ClientAxisEngine")
+
logExit()
}
@@ -71,8 +71,8 @@
int ClientAxisEngine::
process (SOAPTransport* pSoap, bool noResponse)
{
- logEntryEngine("ClientAxisEngine::process")
-
+ logEntryEngine("ClientAxisEngine::process")
+
int Status = AXIS_FAIL;
const WSDDService* pService = NULL;
@@ -80,83 +80,83 @@
{
if (pSoap)
{
- m_pSoap = pSoap;
- string sSessionId = m_pSoap->getSessionId();
-
- do
- {
- // Get the service name that was specified in the second parameter of the call
- // to setTransportProperty( SOAPACTION_HEADER , "") matches a service name in
- // the 'service' part of the WSDD file then call that service now.
- const char* pchService = pSoap->getServiceName();
-
- // Check that there is a valid service name.
- if( pchService != NULL)
- {
- // The convention for the service name appears to be service#port
- if( strchr( pchService, '#') == NULL)
- {
- int iStringLength = strlen( pchService);
- char * pszService = new char[iStringLength];
-
- memset( pszService, 0, iStringLength);
- // If there is no # seperator, then strip off the outer quotes. if they exist !
- if(strchr(pchService, '"') == NULL)
- memcpy( pszService, pchService, iStringLength);
- else
- memcpy( pszService, pchService + 1, iStringLength - 2);
-
- pService = g_pWSDDDeployment->getService( pszService);
-
- delete [] pszService;
- }
- else
- {
- char * pchTempService = new char [strlen(pchService)+1];
-
- // Skip the starting double quote
- strcpy(pchTempService, pchService+1);
-
- // The String returned as the service name has the format "Calculator#add".
- // So null terminate string at #.
- *(strchr(pchTempService, '#')) = '\0';
-
- // get service description object from the WSDD Deployment object
- pService = g_pWSDDDeployment->getService (pchTempService);
-
- delete [] pchTempService;
- }
- }
-
- //Get Global and Transport Handlers
- Status = initializeHandlers (sSessionId, pSoap->getProtocol());
- if (AXIS_SUCCESS != Status)
- {
- logThrowException("AxisEngineException - SERVER_ENGINE_HANDLER_INIT_FAILED")
-
- throw AxisEngineException(SERVER_ENGINE_HANDLER_INIT_FAILED);
- }
-
- //Get Service specific Handlers from the pool if configured any
- if (pService != NULL)
- {
- Status = g_pHandlerPool->getRequestFlowHandlerChain(&m_pSReqFChain, sSessionId, pService);
- if (AXIS_SUCCESS != Status)
- break;
-
- Status = g_pHandlerPool->getResponseFlowHandlerChain(&m_pSResFChain, sSessionId, pService);
- if (AXIS_SUCCESS != Status)
- break;
- }
-
- // Invoke all handlers and then the remote webservice
- // we generate response in the same way even if this has failed
- Status = invoke (m_pMsgData, noResponse);
- }
- while (0);
-
- //release the handlers
- releaseHandlers(sSessionId);
+ m_pSoap = pSoap;
+ string sSessionId = m_pSoap->getSessionId();
+
+ do
+ {
+ // Get the service name that was specified in the second parameter of the call
+ // to setTransportProperty( SOAPACTION_HEADER , "") matches a service name in
+ // the 'service' part of the WSDD file then call that service now.
+ const char* pchService = pSoap->getServiceName();
+
+ // Check that there is a valid service name.
+ if( pchService != NULL)
+ {
+ // The convention for the service name appears to be service#port
+ if( strchr( pchService, '#') == NULL)
+ {
+ int iStringLength = strlen( pchService);
+ char * pszService = new char[iStringLength];
+
+ memset( pszService, 0, iStringLength);
+ // If there is no # seperator, then strip off the outer quotes. if they exist !
+ if(strchr(pchService, '"') == NULL)
+ memcpy( pszService, pchService, iStringLength);
+ else
+ memcpy( pszService, pchService + 1, iStringLength - 2);
+
+ pService = g_pWSDDDeployment->getService( pszService);
+
+ delete [] pszService;
+ }
+ else
+ {
+ char * pchTempService = new char [strlen(pchService)+1];
+
+ // Skip the starting double quote
+ strcpy(pchTempService, pchService+1);
+
+ // The String returned as the service name has the format "Calculator#add".
+ // So null terminate string at #.
+ *(strchr(pchTempService, '#')) = '\0';
+
+ // get service description object from the WSDD Deployment object
+ pService = g_pWSDDDeployment->getService (pchTempService);
+
+ delete [] pchTempService;
+ }
+ }
+
+ //Get Global and Transport Handlers
+ Status = initializeHandlers (sSessionId, pSoap->getProtocol());
+ if (AXIS_SUCCESS != Status)
+ {
+ logThrowException("AxisEngineException - SERVER_ENGINE_HANDLER_INIT_FAILED")
+
+ throw AxisEngineException(SERVER_ENGINE_HANDLER_INIT_FAILED);
+ }
+
+ //Get Service specific Handlers from the pool if configured any
+ if (pService != NULL)
+ {
+ Status = g_pHandlerPool->getRequestFlowHandlerChain(&m_pSReqFChain, sSessionId, pService);
+ if (AXIS_SUCCESS != Status)
+ break;
+
+ Status = g_pHandlerPool->getResponseFlowHandlerChain(&m_pSResFChain, sSessionId, pService);
+ if (AXIS_SUCCESS != Status)
+ break;
+ }
+
+ // Invoke all handlers and then the remote webservice
+ // we generate response in the same way even if this has failed
+ Status = invoke (m_pMsgData, noResponse);
+ }
+ while (0);
+
+ //release the handlers
+ releaseHandlers(sSessionId);
}
}
catch(AxisException& e)
@@ -165,21 +165,21 @@
* the original exception may be an transport exception which will go out of scope when
* the transport library is unloaded.
*/
- logRethrowException()
-
+ logRethrowException()
+
throw AxisGenException(e);
}
- logExitWithReturnCode(Status)
-
- return Status;
+ logExitWithReturnCode(Status)
+
+ return Status;
}
void ClientAxisEngine::
releaseHandlers(string sSessionId)
{
- logEntryEngine("ClientAxisEngine::releaseHandlers")
-
+ logEntryEngine("ClientAxisEngine::releaseHandlers")
+
// Pool back the Service specific handlers
if (m_pSReqFChain)
g_pHandlerPool->poolHandlerChain(m_pSReqFChain, sSessionId);
@@ -198,8 +198,8 @@
int ClientAxisEngine::
invoke (MessageData* pMsg, bool noResponse)
{
- logEntryEngine("ClientAxisEngine::invoke")
-
+ logEntryEngine("ClientAxisEngine::invoke")
+
enum AE_LEVEL { AE_START = 1, AE_SERH, AE_GLH, AE_TRH, AE_SERV };
int Status = AXIS_FAIL;
int level = AE_START;
@@ -207,7 +207,7 @@
do
{
// Invoke client side service specific request handlers
-
+
logDebug("Invoke client side request handlers, if any.")
if (m_pSReqFChain)
@@ -343,7 +343,7 @@
// service specific handlers have failed
};
- logExitWithReturnCode(Status)
+ logExitWithReturnCode(Status)
return Status;
}
Modified: webservices/axis/trunk/c/src/engine/client/Stub.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/engine/client/Stub.cpp?rev=722782&r1=722781&r2=722782&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/engine/client/Stub.cpp (original)
+++ webservices/axis/trunk/c/src/engine/client/Stub.cpp Tue Dec 2 21:27:36 2008
@@ -46,7 +46,7 @@
m_pCall = new Call ();
// Weird, yes, but need to do here since tracing is not enabled until after instantiation of Call class.
- logEntryEngine("Stub::Stub")
+ logEntryEngine("Stub::Stub")
m_pCall->setProtocol (eProtocol);
m_pTransport = m_pCall->getTransport ();
@@ -77,7 +77,7 @@
Stub::~Stub ()
{
- logEntryEngine("Stub::~Stub")
+ logEntryEngine("Stub::~Stub")
delete m_pCall;
m_pCall = NULL;
@@ -95,18 +95,18 @@
void
Stub::setEndPoint (const char *pcEndPoint)
{
- logEntryEngine("Stub::setEndPoint")
+ logEntryEngine("Stub::setEndPoint")
if (m_pTransport)
m_pTransport->setEndpointUri( pcEndPoint);
-
+
logExit()
}
void
Stub::setTransportProperty (const char *pcKey, const char *pcValue)
{
- logEntryEngine("Stub::setTransportProperty")
+ logEntryEngine("Stub::setTransportProperty")
if (m_pTransport)
{
@@ -146,7 +146,7 @@
else
m_pTransport->setTransportProperty (pcKey, pcValue);
}
-
+
logExit()
}
@@ -209,10 +209,10 @@
void
Stub::setHandlerProperty (AxisChar * name, void *value, int len)
{
- logEntryEngine("Stub::setHandlerProperty")
+ logEntryEngine("Stub::setHandlerProperty")
m_pCall->setHandlerProperty (name, value, len);
-
+
logExit()
}
@@ -272,21 +272,21 @@
void
Stub::deleteCurrentSOAPHeaderBlock ()
{
- logEntryEngine("Stub::deleteCurrentSOAPHeaderBlock")
+ logEntryEngine("Stub::deleteCurrentSOAPHeaderBlock")
if (m_viCurrentSOAPHeaderBlock != m_vSOAPHeaderBlocks.end ())
{
delete (*m_viCurrentSOAPHeaderBlock);
m_vSOAPHeaderBlocks.erase (m_viCurrentSOAPHeaderBlock);
}
-
+
logExit()
}
void
Stub::deleteSOAPHeaderBlock (IHeaderBlock * pHeaderBlock)
{
- logEntryEngine("Stub::deleteSOAPHeaderBlock")
+ logEntryEngine("Stub::deleteSOAPHeaderBlock")
vector < IHeaderBlock * >::iterator currentSOAPHeaderBlock =
m_vSOAPHeaderBlocks.begin ();
@@ -301,14 +301,14 @@
}
currentSOAPHeaderBlock++;
}
-
+
logExit()
}
void
Stub::setSOAPHeaders ()
{
- logEntryEngine("Stub::setSOAPHeaders")
+ logEntryEngine("Stub::setSOAPHeaders")
SoapSerializer *pSerializer = NULL;
if (m_pCall)
@@ -317,39 +317,39 @@
if (pSerializer)
for (unsigned int i = 0; i < m_vSOAPHeaderBlocks.size (); i++)
pSerializer->addHeaderBlock (m_vSOAPHeaderBlocks[i]);
-
+
logExit()
}
void
Stub::applyUserPreferences ()
{
- logEntryEngine("Stub::applyUserPreferences")
+ logEntryEngine("Stub::applyUserPreferences")
setSOAPHeaders ();
-
+
logExit()
}
void
Stub::setProxy (const char *pcProxyHost, unsigned int uiProxyPort)
{
- logEntryEngine("Stub::setProxy")
+ logEntryEngine("Stub::setProxy")
if (m_pTransport)
m_pTransport->setProxy (pcProxyHost, uiProxyPort);
-
+
logExit()
}
void
Stub::setTransportTimeout (long lSeconds)
{
- logEntryEngine("Stub::setTransportTimeout")
+ logEntryEngine("Stub::setTransportTimeout")
if (m_pTransport)
m_pTransport->setTimeout (lSeconds);
-
+
logExit()
}
@@ -417,7 +417,7 @@
void
Stub::setProxyUsername (const char *pcProxyUsername)
{
- logEntryEngine("Stub::setProxyUsername")
+ logEntryEngine("Stub::setProxyUsername")
if (m_proxyUsername)
{
@@ -427,11 +427,11 @@
if (pcProxyUsername)
{
- m_proxyUsername = new char[strlen (pcProxyUsername) + 1];
- strcpy (m_proxyUsername, pcProxyUsername);
-
- if (m_proxyPassword)
- setProxyAuthorizationHeader ();
+ m_proxyUsername = new char[strlen (pcProxyUsername) + 1];
+ strcpy (m_proxyUsername, pcProxyUsername);
+
+ if (m_proxyPassword)
+ setProxyAuthorizationHeader ();
}
logExit()
@@ -455,11 +455,11 @@
if (pcProxyPassword)
{
- m_proxyPassword = new char[strlen (pcProxyPassword) + 1];
- strcpy (m_proxyPassword, pcProxyPassword);
-
- if (m_proxyUsername)
- setProxyAuthorizationHeader ();
+ m_proxyPassword = new char[strlen (pcProxyPassword) + 1];
+ strcpy (m_proxyPassword, pcProxyPassword);
+
+ if (m_proxyUsername)
+ setProxyAuthorizationHeader ();
}
}
@@ -481,7 +481,7 @@
void
Stub::setProxyAuthorizationHeader ()
{
- logEntryEngine("Stub::setProxyAuthorizationHeader")
+ logEntryEngine("Stub::setProxyAuthorizationHeader")
char* cpUsernamePassword = new char[strlen( m_proxyUsername) + strlen( m_proxyPassword ) + 2];
strcpy( cpUsernamePassword, m_proxyUsername );
@@ -498,37 +498,37 @@
this->setTransportProperty( "Proxy-Authorization", strValue.c_str());
delete [] cpUsernamePassword;
delete [] base64Value;
-
+
logExit()
}
ISoapAttachment* Stub::createSoapAttachment()
{
- logEntryEngine("Stub::createSoapAttachment")
+ logEntryEngine("Stub::createSoapAttachment")
return m_pCall->createSoapAttachment();
-
+
logExit()
}
/*Methods for supporting SecureChannel*/
void Stub::SetSecure( char * pszArguments, ...)
{
- logEntryEngine("Stub::SetSecure")
+ logEntryEngine("Stub::SetSecure")
va_list args;
va_start( args, pszArguments);
SetSecure(pszArguments, args);
va_end( args);
-
+
logExit()
}
/*Methods for supporting SecureChannel*/
void Stub::SetSecure( char * pszArguments, va_list args)
{
- logEntryEngine("Stub::SetSecure")
+ logEntryEngine("Stub::SetSecure")
int iArgIndex = 0;
char * pszArg = pszArguments;
@@ -546,7 +546,7 @@
if( iArgIndex == 6)
m_sArguments[iArgIndex] = "false";
}
-
+
logExit()
}
@@ -557,19 +557,19 @@
void
Stub::checkForExtraneousElements ()
-{
- logEntryEngine("Stub::checkForExtraneousElements")
+{
+ logEntryEngine("Stub::checkForExtraneousElements")
- IWrapperSoapDeSerializer *pDeSerializer = m_pCall->getSOAPDeSerializer();
+ IWrapperSoapDeSerializer *pDeSerializer = m_pCall->getSOAPDeSerializer();
if (pDeSerializer)
{
- const char *peekedElementName = pDeSerializer->peekNextElementName();
- if (0x00 != *peekedElementName)
- {
- logThrowExceptionWithData("UnknownElementException", peekedElementName)
+ const char *peekedElementName = pDeSerializer->peekNextElementName();
+ if (0x00 != *peekedElementName)
+ {
+ logThrowExceptionWithData("UnknownElementException", peekedElementName)
- throw UnknownElementException(peekedElementName);
- }
+ throw UnknownElementException(peekedElementName);
+ }
}
logExit()