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/03/28 06:42:57 UTC
svn commit: r389392 - in /webservices/axis2/trunk/c:
modules/core/deployment/desc_builder.c modules/xml/om/om_document.c
modules/xml/om/om_stax_builder.c test/xml/om/test_om.c
Author: nandika
Date: Mon Mar 27 20:42:54 2006
New Revision: 389392
URL: http://svn.apache.org/viewcvs?rev=389392&view=rev
Log:
om_document is now create in the builder ,since document is freed when om_stax_builder_free function is called
Modified:
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/xml/om/om_document.c
webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c
webservices/axis2/trunk/c/test/xml/om/test_om.c
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?rev=389392&r1=389391&r2=389392&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Mon Mar 27 20:42:54 2006
@@ -291,10 +291,10 @@
return NULL;
}
/**
- create an om document
+ get the om document form builder
document is the container of om model created using builder
*/
- document = axis2_om_document_create (env, NULL, desc_builder_impl->builder);
+ document = AXIS2_OM_STAX_BUILDER_GET_DOCUMENT(desc_builder_impl->builder, env);
/**
* In description building we don't want defferred building. So build
* the whole tree at once
Modified: webservices/axis2/trunk/c/modules/xml/om/om_document.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_document.c?rev=389392&r1=389391&r2=389392&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_document.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_document.c Mon Mar 27 20:42:54 2006
@@ -141,9 +141,6 @@
document->om_document.ops->get_builder = axis2_om_document_get_builder;
document->om_document.ops->serialize = axis2_om_document_serialize;
- if (NULL != builder)
- AXIS2_OM_STAX_BUILDER_SET_DOCUMENT (builder, env, &(document->om_document));
-
return &(document->om_document);
}
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=389392&r1=389391&r2=389392&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 Mon Mar 27 20:42:54 2006
@@ -115,7 +115,14 @@
builder->current_event = -1;
builder->root_node = NULL;
builder->element_level = 0;
-
+
+ builder->document = axis2_om_document_create(env, NULL, &(builder->om_stax_builder));
+ if(!builder->document)
+ {
+ AXIS2_FREE((*env)->allocator, builder);
+ return NULL;
+ }
+
/* ops */
builder->om_stax_builder.ops = NULL;
builder->om_stax_builder.ops = (axis2_om_stax_builder_ops_t *) AXIS2_MALLOC(
@@ -137,15 +144,19 @@
builder->om_stax_builder.ops->free =
axis2_om_stax_builder_free;
- builder->om_stax_builder.ops->set_document =
+
+ builder->om_stax_builder.ops->set_document =
axis2_om_stax_builder_set_document;
-
+
+ builder->om_stax_builder.ops->get_document =
+ axis2_om_stax_builder_get_document;
+
builder->om_stax_builder.ops->next_with_token =
axis2_om_stax_builder_next_with_token;
builder->om_stax_builder.ops->is_complete =
axis2_om_stax_builder_is_complete;
-
+
return &(builder->om_stax_builder);
}
Modified: webservices/axis2/trunk/c/test/xml/om/test_om.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/xml/om/test_om.c?rev=389392&r1=389391&r2=389392&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/om/test_om.c (original)
+++ webservices/axis2/trunk/c/test/xml/om/test_om.c Mon Mar 27 20:42:54 2006
@@ -84,12 +84,14 @@
document is the container of om model created using builder
*/
- document = axis2_om_document_create (&environment, NULL, builder);
+ document = AXIS2_OM_STAX_BUILDER_GET_DOCUMENT (builder, &environment);
/**
get root element , building starts hear
*/
-
- node1 = AXIS2_OM_DOCUMENT_GET_ROOT_ELEMENT (document,&environment);
+ if(!document)
+ return -1;
+
+ node1 = AXIS2_OM_DOCUMENT_GET_ROOT_ELEMENT (document, &environment);
if(!node1)
{
printf(" root element null ");