damitha 2003/07/08 05:22:02
Modified: c/src/engine AxisEngine.cpp HandlerChain.cpp HandlerPool.cpp
Log:
Revision Changes Path
1.3 +6 -1 xml-axis/c/src/engine/AxisEngine.cpp
Index: AxisEngine.cpp
===================================================================
RCS file: /home/cvs/xml-axis/c/src/engine/AxisEngine.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AxisEngine.cpp 2 Jul 2003 04:54:22 -0000 1.2
+++ AxisEngine.cpp 8 Jul 2003 12:22:01 -0000 1.3
@@ -321,6 +321,7 @@
}
}
+ DEBUG1("AFTER pChain = m_pHandlerPool->GetTransportRequestFlowHandlerChain");
level++; // AE_TRH
//invoke global request handlers
pChain = m_pHandlerPool->GetGlobalRequestFlowHandlerChain();
@@ -332,6 +333,7 @@
break; //do .. while (0)
}
}
+ DEBUG1("AFTER pChain = m_pHandlerPool->GetGlobalRequestFlowHandlerChain();");
level++; //AE_GLH
//invoke service specific request handlers
pChain = m_pHandlerPool->GetServiceRequestFlowHandlerChain();
@@ -344,6 +346,7 @@
}
DEBUG1("if(SUCCESS == pChain->Invoke(pMsg))");
}
+ DEBUG1("AFTER pChain = m_pHandlerPool->GetServiceRequestFlowHandlerChain();");
level++; //AE_SERH
//call actual web service handler
if (m_pWebService)
@@ -352,6 +355,8 @@
pMsg->m_pSZ->setSoapFault(SoapFault::getSoapFault(SF_WEBSERVICEFAILED));
break;
}
+
+ DEBUG1("if (m_pWebService)");
level++; //AE_SERV
}
@@ -381,7 +386,7 @@
}
//no break;
case AE_TRH: //global handlers have failed
- pChain =
m_pHandlerPool->GetTransportRequestFlowHandlerChain(pMsg->m_Protocol);
+ pChain =
m_pHandlerPool->GetTransportResponseFlowHandlerChain(pMsg->m_Protocol);
if (pChain)
{
pChain->Invoke(pMsg);
1.3 +2 -0 xml-axis/c/src/engine/HandlerChain.cpp
Index: HandlerChain.cpp
===================================================================
RCS file: /home/cvs/xml-axis/c/src/engine/HandlerChain.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HandlerChain.cpp 2 Jul 2003 04:54:23 -0000 1.2
+++ HandlerChain.cpp 8 Jul 2003 12:22:01 -0000 1.3
@@ -90,6 +90,7 @@
m_itCurrHandler = m_HandlerList.begin();
while (m_itCurrHandler != m_HandlerList.end())
{
+ DEBUG1("while (m_itCurrHandler != m_HandlerList.end())");
if (SUCCESS == (*m_itCurrHandler)->Invoke(pMsg))
{
m_itCurrHandler++;
@@ -101,6 +102,7 @@
return FAIL;
}
}
+ DEBUG1("HandlerChain::Invoke end");
return SUCCESS;
}
1.3 +12 -3 xml-axis/c/src/engine/HandlerPool.cpp
Index: HandlerPool.cpp
===================================================================
RCS file: /home/cvs/xml-axis/c/src/engine/HandlerPool.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HandlerPool.cpp 2 Jul 2003 04:54:23 -0000 1.2
+++ HandlerPool.cpp 8 Jul 2003 12:22:01 -0000 1.3
@@ -274,9 +274,11 @@
HandlerChain* HandlerPool::LoadHandlerChain(WSDDHandlerList *pHandlerList)
{
+ DEBUG1("HandlerPool::LoadHandlerChain");
int nLoaded = 0;
HandlerChain* pHc = NULL;
- if (pHandlerList && !pHandlerList->empty()) {
+ if (pHandlerList && !pHandlerList->empty())
+ {
pHc = new HandlerChain();
//BasicHandler* pBh = NULL;;
Handler* pH = NULL;
@@ -284,17 +286,24 @@
it != pHandlerList->end(); it++)
{
//if ((pBh = LoadHandler(*it)) != NULL)
+ DEBUG1("BEFORE BasicHandler *pBh = LoadHandler(*it);");
BasicHandler *pBh = LoadHandler(*it);
+ DEBUG1("AFTER BasicHandler *pBh = LoadHandler(*it);");
if (pBh)
{
+ DEBUG1("BEFORE pH = dynamic_cast<Handler*>(pBh);");
pH = dynamic_cast<Handler*>(pBh);
+ DEBUG1("AFTER pH = dynamic_cast<Handler*>(pBh);");
if (pH)
- {
-
+ {
DEBUG1("if (pH)");
pH->SetOptionList((*it)->GetOptionList());
nLoaded++;
pHc->AddHandler(pH);
+ }
+ else
+ {
+ return NULL;
}
}
}