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 2006/01/23 06:22:13 UTC
svn commit: r371466 - in /webservices/axis2/trunk/c/modules/xml:
om/om_node.c om/om_stax_builder.c soap/soap11_builder_helper.c
soap/soap12_builder_helper.c soap/soap_fault_sub_code.c
Author: nandika
Date: Sun Jan 22 21:22:02 2006
New Revision: 371466
URL: http://svn.apache.org/viewcvs?rev=371466&view=rev
Log:
error corrected
Modified:
webservices/axis2/trunk/c/modules/xml/om/om_node.c
webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c
webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c
webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c
webservices/axis2/trunk/c/modules/xml/soap/soap_fault_sub_code.c
Modified: webservices/axis2/trunk/c/modules/xml/om/om_node.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_node.c?rev=371466&r1=371465&r2=371466&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_node.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_node.c Sun Jan 22 21:22:02 2006
@@ -596,7 +596,7 @@
om_node_impl = AXIS2_INTF_TO_IMPL(om_node);
/**********************************************************/
while(!(om_node_impl->first_child) && !(om_node_impl->done)
- && om_node_impl->builder)
+ && om_node_impl->builder && !(AXIS2_OM_STAX_BUILDER_IS_COMPLETE(om_node_impl->builder, env)))
{
AXIS2_OM_STAX_BUILDER_NEXT_WITH_TOKEN(om_node_impl->builder, env);
}
@@ -630,7 +630,8 @@
om_node_impl = AXIS2_INTF_TO_IMPL(om_node);
/*****************************************************/
while(!(om_node_impl->next_sibling) && om_node_impl->parent &&
- om_node_impl->builder && !(AXIS2_OM_NODE_GET_BUILD_STATUS(om_node_impl->parent, env)))
+ om_node_impl->builder && !(AXIS2_OM_NODE_GET_BUILD_STATUS(om_node_impl->parent, env)) &&
+ !(AXIS2_OM_STAX_BUILDER_IS_COMPLETE(om_node_impl->builder, env)))
{
AXIS2_OM_STAX_BUILDER_NEXT_WITH_TOKEN(om_node_impl->builder, env);
}
Modified: webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c?rev=371466&r1=371465&r2=371466&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c Sun Jan 22 21:22:02 2006
@@ -899,8 +899,10 @@
token = AXIS2_XML_READER_NEXT (builder_impl->parser, env);
if(token == -1)
+ {
+ builder_impl->done = AXIS2_TRUE;
return -1;
-
+ }
if (!(builder_impl->cache))
{
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c?rev=371466&r1=371465&r2=371466&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c Sun Jan 22 21:22:02 2006
@@ -179,6 +179,9 @@
AXIS2_SOAP_FAULT_CODE_SET_BASE_NODE(fault_code, env, om_element_node);
AXIS2_SOAP_FAULT_CODE_SET_SOAP_VERSION(fault_code, env, AXIS2_SOAP11);
AXIS2_SOAP_FAULT_SET_CODE(soap_fault, env, fault_code);
+
+ AXIS2_SOAP_FAULT_CODE_SET_BUILDER(fault_code, env, builder_helper_impl->soap_builder);
+
AXIS2_OM_ELEMENT_SET_LOCALNAME(om_ele, env, AXIS2_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME);
fault_value = axis2_soap_fault_value_create_with_code(env, fault_code);
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c?rev=371466&r1=371465&r2=371466&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c Sun Jan 22 21:22:02 2006
@@ -194,6 +194,7 @@
soap_fault_code = axis2_soap_fault_code_create(env);
AXIS2_SOAP_FAULT_CODE_SET_BASE_NODE(soap_fault, env, om_ele_node);
AXIS2_SOAP_FAULT_CODE_SET_SOAP_VERSION(soap_fault_code, env, AXIS2_SOAP12);
+
AXIS2_SOAP_FAULT_CODE_SET_BUILDER(soap_fault_code, env,
builder_helper_impl->soap_builder);
AXIS2_SOAP_FAULT_SET_CODE(soap_fault, env, soap_fault_code);
@@ -267,10 +268,8 @@
soap_fault_node = axis2_soap_fault_node_create(env);
AXIS2_SOAP_FAULT_NODE_SET_BASE_NODE(soap_fault_node, env, om_ele_node);
- /*
AXIS2_SOAP_FAULT_NODE_SET_SOAP_VERSION(soap_fault_node, env, AXIS2_SOAP12);
AXIS2_SOAP_FAULT_SET_NODE(soap_fault, env, soap_fault_node);
- */
builder_helper_impl->node_present = AXIS2_TRUE;
}
}else
@@ -417,6 +416,10 @@
AXIS2_SOAP_FAULT_SUB_CODE_SET_SOAP_VRESION(fault_subcode, env, AXIS2_SOAP12);
fault_code = AXIS2_SOAP_FAULT_GET_CODE(soap_fault, env);
AXIS2_SOAP_FAULT_CODE_SET_SUB_CODE(fault_code, env, fault_subcode);
+
+ AXIS2_SOAP_FAULT_SUB_CODE_SET_BUILDER(fault_subcode, env,
+ builder_helper_impl->soap_builder);
+
builder_helper_impl->sub_code_present = AXIS2_TRUE;
builder_helper_impl->sub_code_processing = AXIS2_TRUE;
}
@@ -515,7 +518,6 @@
AXIS2_SOAP_FAULT_VALUE_SET_BASE_NODE(value, env, om_ele_node);
AXIS2_SOAP_FAULT_VALUE_SET_SOAP_VERSION(value, env, AXIS2_SOAP12);
AXIS2_SOAP_FAULT_SUB_CODE_SET_VALUE(sub_code, env, value);
-
builder_helper_impl->subcode_value_present = AXIS2_TRUE;
builder_helper_impl->sub_sub_code_present = AXIS2_FALSE;
builder_helper_impl->sub_code_processing = AXIS2_FALSE;
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_fault_sub_code.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_fault_sub_code.c?rev=371466&r1=371465&r2=371466&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_fault_sub_code.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_fault_sub_code.c Sun Jan 22 21:22:02 2006
@@ -268,12 +268,21 @@
axis2_om_node_t *subcode_node = NULL;
axis2_om_node_t *this_node = NULL;
axis2_soap_fault_value_t* fault_value = NULL;
-
+ int status = AXIS2_SUCCESS;
AXIS2_FUNC_PARAM_CHECK(fault_sub_code, env, NULL);
fault_subcode_impl = AXIS2_INTF_TO_IMPL(fault_sub_code);
this_node = AXIS2_SOAP_FAULT_SUB_CODE_GET_BASE_NODE(fault_sub_code, env);
-
+ if(fault_subcode_impl->builder)
+ {
+ while(!(fault_subcode_impl->value) && !AXIS2_OM_NODE_GET_BUILD_STATUS(fault_subcode_impl->om_ele_node, env))
+ {
+ status = AXIS2_SOAP_BUILDER_NEXT(fault_subcode_impl->builder, env);
+ if(status == AXIS2_FAILURE)
+ return NULL;
+ }
+ }
+ /*
if(!(fault_subcode_impl->value))
{
subcode_node = axis2_soap_utils_get_child_with_name(env,
@@ -284,6 +293,7 @@
AXIS2_SOAP_FAULT_VALUE_SET_BASE_NODE(fault_value, env, subcode_node);
fault_subcode_impl->value = fault_value;
}
+ */
return fault_subcode_impl->value;
}
axis2_status_t AXIS2_CALL
@@ -330,12 +340,25 @@
axis2_om_node_t *subcode_node = NULL;
axis2_om_node_t *this_node = NULL;
axis2_soap_fault_sub_code_t* subcode = NULL;
-
+ int status = AXIS2_SUCCESS;
AXIS2_FUNC_PARAM_CHECK(fault_sub_code, env, NULL);
fault_subcode_impl = AXIS2_INTF_TO_IMPL(fault_sub_code);
this_node = fault_subcode_impl->om_ele_node;
-
+ if(fault_subcode_impl->builder)
+ {
+ while(!(fault_subcode_impl->subcode) && !AXIS2_OM_NODE_GET_BUILD_STATUS(fault_subcode_impl->om_ele_node, env))
+ {
+ status = AXIS2_SOAP_BUILDER_NEXT(fault_subcode_impl->builder, env);
+ if(status == AXIS2_FAILURE)
+ return NULL;
+ }
+ }
+ if(fault_subcode_impl->subcode)
+ {
+ return subcode;
+ }
+ /*
if(!(fault_subcode_impl->subcode))
{
subcode_node = axis2_soap_utils_get_child_with_name(env,
@@ -346,7 +369,8 @@
AXIS2_SOAP_FAULT_SUB_CODE_SET_BASE_NODE(subcode , env, subcode_node);
fault_subcode_impl->subcode = subcode;
}
- return fault_subcode_impl->subcode;
+ */
+ return NULL;
}
axis2_status_t AXIS2_CALL