You are viewing a plain text version of this content. The canonical link for it is here.
Posted to c-commits@axis.apache.org by sh...@apache.org on 2010/04/05 16:02:52 UTC
svn commit: r930860 - in /axis/axis2/c/core/trunk:
axiom/src/om/om_children_qname_iterator.c axiom/src/soap/soap_body.c
axiom/src/soap/soap_builder.c samples/server/notify/notify.c
Author: shankar
Date: Mon Apr 5 14:02:51 2010
New Revision: 930860
URL: http://svn.apache.org/viewvc?rev=930860&view=rev
Log:
Fixing invalid error loggings
Modified:
axis/axis2/c/core/trunk/axiom/src/om/om_children_qname_iterator.c
axis/axis2/c/core/trunk/axiom/src/soap/soap_body.c
axis/axis2/c/core/trunk/axiom/src/soap/soap_builder.c
axis/axis2/c/core/trunk/samples/server/notify/notify.c
Modified: axis/axis2/c/core/trunk/axiom/src/om/om_children_qname_iterator.c
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/om/om_children_qname_iterator.c?rev=930860&r1=930859&r2=930860&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/om/om_children_qname_iterator.c (original)
+++ axis/axis2/c/core/trunk/axiom/src/om/om_children_qname_iterator.c Mon Apr 5 14:02:51 2010
@@ -38,8 +38,6 @@ axiom_children_qname_iterator_create(
{
axiom_children_qname_iterator_t *iterator = NULL;
- AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, current_child, NULL);
iterator = (axiom_children_qname_iterator_t *)AXIS2_MALLOC(env->allocator,
sizeof(axiom_children_qname_iterator_t));
Modified: axis/axis2/c/core/trunk/axiom/src/soap/soap_body.c
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/soap/soap_body.c?rev=930860&r1=930859&r2=930860&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/soap/soap_body.c (original)
+++ axis/axis2/c/core/trunk/axiom/src/soap/soap_body.c Mon Apr 5 14:02:51 2010
@@ -144,21 +144,26 @@ axiom_soap_body_has_fault(
}
else
{
- while(!axiom_node_is_complete(soap_body->om_ele_node, env))
+ /* This soap body could have been built programatically. Do the following only if soap
+ * body is created from soap_builder */
+ if(soap_body->soap_builder)
{
- if(axiom_soap_builder_next(soap_body->soap_builder, env) != AXIS2_SUCCESS)
+ while(!axiom_node_is_complete(soap_body->om_ele_node, env))
{
- /* problem in building the SOAP body. Note that has_fault is about soap fault,
- * not about problem in building the node. So, even though there is a problem
- * building the body, has_fault should be AXIS2_FALSE
- */
- break;
- }
+ if(axiom_soap_builder_next(soap_body->soap_builder, env) != AXIS2_SUCCESS)
+ {
+ /* problem in building the SOAP body. Note that has_fault is about soap fault,
+ * not about problem in building the node. So, even though there is a problem
+ * building the body, has_fault should be AXIS2_FALSE
+ */
+ break;
+ }
- if(soap_body->soap_fault)
- {
- soap_body->has_fault = AXIS2_TRUE;
- break;
+ if(soap_body->soap_fault)
+ {
+ soap_body->has_fault = AXIS2_TRUE;
+ break;
+ }
}
}
}
Modified: axis/axis2/c/core/trunk/axiom/src/soap/soap_builder.c
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/soap/soap_builder.c?rev=930860&r1=930859&r2=930860&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/soap/soap_builder.c (original)
+++ axis/axis2/c/core/trunk/axiom/src/soap/soap_builder.c Mon Apr 5 14:02:51 2010
@@ -151,6 +151,7 @@ axiom_soap_builder_create(
soap_builder->soap_version = AXIOM_SOAP12;
soap_builder->last_node_status = -1;
soap_builder->om_builder = stax_builder;
+ soap_builder->done = AXIS2_FALSE;
status = axiom_soap_builder_identify_soap_version(soap_builder, env, soap_version);
if(status != AXIS2_SUCCESS)
Modified: axis/axis2/c/core/trunk/samples/server/notify/notify.c
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/server/notify/notify.c?rev=930860&r1=930859&r2=930860&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/server/notify/notify.c (original)
+++ axis/axis2/c/core/trunk/samples/server/notify/notify.c Mon Apr 5 14:02:51 2010
@@ -59,7 +59,7 @@ axis2_notify_notify(
{
axis2_char_t *text_str =
(axis2_char_t *) axiom_text_get_value(text, env);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Notification received : %s", text_str);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Notification received : %s", text_str);
}
}
else