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/07/06 13:22:31 UTC
svn commit: r553838 - in /incubator/tuscany/cpp/sdo:
runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp sdotest.bat
Author: robbinspg
Date: Fri Jul 6 04:22:30 2007
New Revision: 553838
URL: http://svn.apache.org/viewvc?view=rev&rev=553838
Log: (empty)
Modified:
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp
incubator/tuscany/cpp/sdo/sdotest.bat
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp?view=diff&rev=553838&r1=553837&r2=553838
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp Fri Jul 6 04:22:30 2007
@@ -587,6 +587,19 @@
SDOXMLString importNamespace = attributes.getValue("namespace");
SDOXMLString schemaLocation = attributes.getValue("schemaLocation");
+ if (localname.equalsIgnoreCase("import")
+ && !importNamespace.isNull())
+ {
+ // Do not attempt to import namespaces alredy defined
+ for (unsigned int i = 0; i < definedNamespaces.size(); i++)
+ {
+ if (definedNamespaces[i].equals(importNamespace))
+ {
+ return;
+ }
+ }
+ }
+
SchemaInfo schemaInf;
SDOSchemaSAX2Parser schemaParser(schemaInf, setter, parsedLocations, definedNamespaces);
@@ -601,15 +614,6 @@
if (localname.equalsIgnoreCase("import")
&& !importNamespace.isNull())
{
- // Do not attempt to import namespaces alredy defined
- for (unsigned int i = 0; i < definedNamespaces.size(); i++)
- {
- if (definedNamespaces[i].equals(importNamespace))
- {
- return;
- }
- }
-
if (0 != schemaParser.parseURI(importNamespace, SDOXMLString()))
return;
}
Modified: incubator/tuscany/cpp/sdo/sdotest.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/sdotest.bat?view=diff&rev=553838&r1=553837&r2=553838
==============================================================================
--- incubator/tuscany/cpp/sdo/sdotest.bat (original)
+++ incubator/tuscany/cpp/sdo/sdotest.bat Fri Jul 6 04:22:30 2007
@@ -29,9 +29,9 @@
set PATH=%TUSCANY_SDOCPP%\bin;%PATH%
-set SCATESTPATH=%cd%\vsexpress\tuscany_sdo\sdo_test\%buildtype%
+set SDOTESTPATH=%cd%\vsexpress\tuscany_sdo\sdo_test\%buildtype%
cd runtime\core\test
-"%SCATESTPATH%\sdo_test"
+"%SDOTESTPATH%\sdo_test"
:end
@endlocal
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org