You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ed...@apache.org on 2006/06/21 18:33:47 UTC
svn commit: r416028 - in /incubator/tuscany/cpp/sca/runtime:
core/src/tuscany/sca/ws/EntryPointProxy.cpp
ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp
Author: edslattery
Date: Wed Jun 21 09:33:46 2006
New Revision: 416028
URL: http://svn.apache.org/viewvc?rev=416028&view=rev
Log:
fixes for tuscany482
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp
incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp?rev=416028&r1=416027&r2=416028&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp Wed Jun 21 09:33:46 2006
@@ -51,10 +51,12 @@
catch(SystemConfigurationException &ex)
{
LOGERROR_1(0, "SystemConfigurationException has been caught: %s\n", ex.getMessageText());
+ scaEntryPoint = 0;
}
catch(ServiceRuntimeException &ex)
{
LOGERROR_2(0, "%s has been caught: %s\n", ex.getEClassName(), ex.getMessageText());
+ scaEntryPoint = 0;
}
LOGEXIT(1,"EntryPointProxy::constructor");
}
@@ -68,6 +70,7 @@
DataFactoryPtr EntryPointProxy::getDataFactory()
{
+ if (scaEntryPoint == 0) return 0;
return scaEntryPoint->getDataFactory();
}
@@ -78,6 +81,12 @@
{
LOGENTRY(1,"EntryPointProxy::invoke");
+ if (scaEntryPoint == 0)
+ {
+ LOGINFO(4, "EntryPointProxy has not got an sca EntryPoint\n");
+ return NULL;
+ }
+
DataFactoryPtr dataFactoryPtr = scaEntryPoint->getDataFactory();
DataObjectPtr outputDataObject = NULL;
@@ -106,6 +115,11 @@
//printf("EntryPointProxy has got WS Binding with NamespaceURL: %s Port: %s Service: %s\n", wsdlNamespace.c_str(), wsdlPort.c_str(), wsdlService.c_str());
Wsdl* wsdl = module->findWsdl(wsdlNamespace);
+ if (wsdl == 0)
+ {
+ LOGINFO_1(0, "WSDL description %s not found\n", wsdlNamespace);
+ return NULL;
+ }
WsdlOperation operation = wsdl->findOperation(wsdlService, wsdlPort, operationName);
Modified: incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp?rev=416028&r1=416027&r2=416028&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp Wed Jun 21 09:33:46 2006
@@ -145,7 +145,11 @@
//Utils::printTypes(entryPointProxy.getDataFactory());
AxiomHelper* axiomHelper = AxiomHelper::getHelper();
-
+ if (entryPointProxy.getDataFactory() == 0)
+ {
+ AXIS2_LOG_ERROR((env)->log, AXIS2_LOG_SI, "Axis2EntryPointService_invoke: EntryPoint has no SCA implementation");
+ return 0;
+ }
//char* om_str = NULL;
//om_str = AXIOM_NODE_TO_STRING(node, env);
//if (om_str)
@@ -167,7 +171,7 @@
AXIS2_LOG_ERROR((env)->log, AXIS2_LOG_SI, "Axis2EntryPointService_invoke: Failure whilst invoking EntryPoint");
//LOGERROR(0, "Axis2EntryPointService_invoke: Failure whilst invoking EntryPoint");
/** TODO: return a SOAP fault here */
- return node;
+ return 0;
}
returnNode = axiomHelper->toAxiomNode(outputDataObject);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org