MONDRIAN:

* Fix namespace declaration in Execute response (reported by Anton Nikitin) [git-p4: depot-paths = "//open/mondrian/": change = 5429]
pentaho · Feb 14, 2006 · 9a3d195 · 9a3d195
1 parent c1f2bb5
commit 9a3d195
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/mondrian/xmla/XmlaHandler.java b/src/main/mondrian/xmla/XmlaHandler.java
@@ -137,11 +137,11 @@ private void execute(XmlaRequest request, XmlaResponse response) {
 
         writer.startElement("ExecuteResponse", new String[] {
             "xmlns", NS_XMLA});
-        writer.startElement("return", new String[] {
+        writer.startElement("return");
+        writer.startElement("root", new String[] {
+            "xmlns", request.isDrillThrough() ? NS_XMLA_ROWSET : NS_XMLA_MDDATASET,
             "xmlns:xsi", NS_XSI,
             "xmlns:xsd", NS_XSD,});
-        writer.startElement("root", new String[] {
-            "xmlns", request.isDrillThrough() ? NS_XMLA_ROWSET : NS_XMLA_MDDATASET});
         writer.verbatim(DatasetXmlSchema);
 
         try {

diff --git a/testsrc/main/mondrian/xmla/test/queryFiles/executeHR.xml b/testsrc/main/mondrian/xmla/test/queryFiles/executeHR.xml
@@ -16,8 +16,8 @@
   </Properties>
 </Execute>
 <ExecuteResponse xmlns="urn:schemas-microsoft-com:xml-analysis">
-  <return xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <root xmlns="urn:schemas-microsoft-com:xml-analysis:mddataset">
+  <return>
+    <root xmlns="urn:schemas-microsoft-com:xml-analysis:mddataset" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
       <xsd:schema targetNamespace="urn:schemas-microsoft-com:xml-analysis:mddataset" elementFormDefault="qualified" xmlns:sql="urn:schemas-microsoft-com:xml-sql">
         <xsd:complexType name="MemberType">
           <xsd:attribute name="Hierarchy" type="xsd:string"/>