You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2007/06/22 18:43:33 UTC
svn commit: r549872 -
/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp
Author: robbinspg
Date: Fri Jun 22 09:43:32 2007
New Revision: 549872
URL: http://svn.apache.org/viewvc?view=rev&rev=549872
Log:
fix linux exception
Modified:
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp?view=diff&rev=549872&r1=549871&r2=549872
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XMLHelperImpl.cpp Fri Jun 22 09:43:32 2007
@@ -171,7 +171,18 @@
const char* rootElementURI,
const char* rootElementName)
{
- return new XMLDocumentImpl(dataObject, rootElementURI, rootElementName);
+ SDOString uri;
+ SDOString name = rootElementName;
+ if (0 == rootElementURI)
+ uri = "";
+ else
+ uri = rootElementURI;
+ if (0 == rootElementName)
+ name = "";
+ else
+ name = rootElementName;
+
+ return createDocument(dataObject, uri, name);
}
XMLDocumentPtr XMLHelperImpl::createDocument(
DataObjectPtr dataObject,
@@ -193,7 +204,7 @@
this);
if (sdoParser.parse(xmlFile) == 0)
{
- return createDocument(rootDataObject, (const char*)sdoParser.getRootElementURI(), (const char*)sdoParser.getRootElementName());
+ return createDocument(rootDataObject, (const char*)sdoParser.getRootElementURI(), sdoParser.getRootElementName());
}
return 0;
}
@@ -210,7 +221,7 @@
this);
if (sdoParser.parse(xmlFile.c_str()) == 0)
{
- return createDocument(rootDataObject, (const char*)sdoParser.getRootElementURI(), (const char*)sdoParser.getRootElementName());
+ return createDocument(rootDataObject, (const char*)sdoParser.getRootElementURI(), sdoParser.getRootElementName());
}
return 0;
}
@@ -227,7 +238,7 @@
this);
clearErrors();
inXml>>sdoParser;
- return createDocument(rootDataObject, (const char*)sdoParser.getRootElementURI(), (const char*)sdoParser.getRootElementName());
+ return createDocument(rootDataObject, (const char*)sdoParser.getRootElementURI(), sdoParser.getRootElementName());
}
XMLDocumentPtr XMLHelperImpl::load(
@@ -241,7 +252,7 @@
this);
clearErrors();
inXml>>sdoParser;
- return createDocument(rootDataObject, (const char*)sdoParser.getRootElementURI(), (const char*)sdoParser.getRootElementName());
+ return createDocument(rootDataObject, (const char*)sdoParser.getRootElementURI(), sdoParser.getRootElementName());
}
XMLDocumentPtr XMLHelperImpl::load(
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org