MONDRIAN: Oops!

[git-p4: depot-paths = "//open/mondrian/": change = 3415]
pentaho · Mar 29, 2005 · d5b6f73 · d5b6f73
1 parent 0ed61d4
commit d5b6f73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/mondrian/xmla/XmlaUtil.java b/src/main/mondrian/xmla/XmlaUtil.java
@@ -51,8 +51,8 @@ public static Map getRequestMap() {
         // Deal with embedded & that can be in the JDBC URL
         String dataSource =
                 "Provider=Mondrian;"
-                + "Jdbc=" + url + ";"
                 + "Jdbc=" + url.replaceAll("&", "&amp;") + ";"
+                + "Catalog=" + catalogName + ";"
                 + "JdbcDrivers=" + driver +";";
         final HashMap map = new HashMap();
         String[] sampleRequests = getSampleRequests(catalogName, dataSource);

diff --git a/webapp/xmlaTest.jsp b/webapp/xmlaTest.jsp
@@ -4,7 +4,7 @@
                  java.io.PrintWriter,
                  java.io.StringWriter,
                  mondrian.xmla.XmlaUtil,
-                 java.util.HashMap,
+                 java.util.Map,
                  java.util.Arrays"%>
 <%@ page language="java" %>
 <%--
@@ -30,7 +30,7 @@
         return sw.toString();
     }
 
-    private static final HashMap requestMap = XmlaUtil.getRequestMap();
+    private static final Map requestMap = XmlaUtil.getRequestMap();
 %>
 <html>
 <head>