MONDRIAN: Bugfix when using a DataSource

[git-p4: depot-paths = "//open/mondrian/": change = 535]
pentaho · May 26, 2003 · c36e0f1 · c36e0f1
1 parent 7c07d90
commit c36e0f1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/mondrian/rolap/RolapConnection.java b/src/main/mondrian/rolap/RolapConnection.java
@@ -78,9 +78,9 @@ public RolapConnection(Util.PropertyList connectInfo) {
 					"' must contain either '" + RolapConnectionProperties.Jdbc +
 					"' or '" + RolapConnectionProperties.DataSource + "'");
 		}
+		this.catalogName = connectInfo.get(RolapConnectionProperties.Catalog);
 		if (jdbcConnectString != null) {
 			// Get connection through JDBC DriverManager.
-			this.catalogName = connectInfo.get(RolapConnectionProperties.Catalog);
 			String provider = connectInfo.get(RolapConnectionProperties.Provider);
 			Util.assertTrue(provider.equalsIgnoreCase("mondrian"));
 			String jdbcDrivers = connectInfo.get(RolapConnectionProperties.JdbcDrivers);