fix bug (that was already fixed) for catalog restriction in XMLA requ…

…ests (for ssas / palo)

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@403 c6a108a4-781c-0410-a6c6-c2d559e19af0

src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java

@@ -852,15 +852,18 @@ public String generateRequest(
  }
 
  // If the request requires catalog name, and one wasn't specified in the
- // restrictions, use the connection's current schema. (Note: What XMLA
- // calls a catalog, JDBC calls a schema.)
- if (context.olap4jSchema != null) {
- requestCatalogName = context.olap4jSchema.getName();
+ // restrictions, use the connection's current catalog.
+ if (context.olap4jCatalog != null) {
+ requestCatalogName = context.olap4jCatalog.getName();
  }
  if (requestCatalogName == null
  && metadataRequest.requiresCatalogName())
  {
- requestCatalogName = context.olap4jConnection.getSchema().getName();
+ List<Catalog> catalogs =
+ context.olap4jConnection.getMetaData().getOlapCatalogs();
+ if (catalogs.size() > 0) {
+ requestCatalogName = catalogs.get(0).getName();
+ }
  }
 
  // Add the catalog node only if this request has specified it as a