MONDRIAN Implements the data source lock box functionality on the mon…

…drian side. [git-p4: depot-paths = "//open/mondrian-release/3.2/": change = 13963]
pentaho · Dec 8, 2010 · 169c654 · 169c654
1 parent aab5192
commit 169c654
Showing 1 changed file with 43 additions and 2 deletions.
diff --git a/src/main/mondrian/olap4j/MondrianOlap4jConnection.java b/src/main/mondrian/olap4j/MondrianOlap4jConnection.java
@@ -13,6 +13,8 @@
 import mondrian.olap.*;
 import mondrian.olap.Member;
 import mondrian.rolap.*;
+import mondrian.spi.CatalogLocator;
+import mondrian.util.LockBox;
 
 import mondrian.xmla.XmlaHandler;
 import org.olap4j.Axis;
@@ -32,6 +34,8 @@
 import java.sql.*;
 import java.util.*;
 
+import javax.sql.DataSource;
+
 /**
  * Implementation of {@link org.olap4j.OlapConnection}
  * for the Mondrian OLAP engine.
@@ -128,9 +132,46 @@ abstract class MondrianOlap4jConnection implements OlapConnection {
         for (Map.Entry<String, String> entry : map.entrySet()) {
             list.put(entry.getKey(), entry.getValue());
         }
+        final LockBox driverLockBox =
+            MondrianOlap4jDriver.getLockBox();
+        CatalogLocator catalogLocator = null;
+        DataSource dataSource = null;
+        if (list.get(MondrianOlap4jDriver.Moniker.SharedDataSource.name())
+                != null)
+        {
+            final mondrian.util.LockBox.Entry datasourceEntry =
+                driverLockBox.get(
+                    list.get(
+                        MondrianOlap4jDriver.Moniker.SharedDataSource
+                            .name()));
+            if (datasourceEntry != null
+                    && datasourceEntry.getValue() != null
+                    && datasourceEntry.getValue() instanceof DataSource)
+            {
+                dataSource = (DataSource) datasourceEntry.getValue();
+            }
+        }
+        if (list.get(MondrianOlap4jDriver.Moniker.SharedCatalogLocator.name())
+                != null)
+        {
+            final mondrian.util.LockBox.Entry catalogEntry =
+                driverLockBox.get(
+                    list.get(
+                        MondrianOlap4jDriver.Moniker.SharedCatalogLocator
+                            .name()));
+            if (catalogEntry != null
+                    && catalogEntry.getValue() != null
+                    && catalogEntry.getValue() instanceof CatalogLocator)
+            {
+                catalogLocator = (CatalogLocator) catalogEntry.getValue();
+            }
+        }
         this.mondrianConnection =
-            (RolapConnection) mondrian.olap.DriverManager.getConnection(
-                list, null);
+            (RolapConnection) mondrian.olap.DriverManager
+                .getConnection(
+                    list,
+                    catalogLocator,
+                    dataSource);
         this.olap4jDatabaseMetaData =
             factory.newDatabaseMetaData(this, mondrianConnection);
         this.olap4jSchema = toOlap4j(mondrianConnection.getSchema());