Skip to content

Commit

Permalink
MONDRIAN
Browse files Browse the repository at this point in the history 
       Now checks that catalog is non-null.

[git-p4: depot-paths = "//open/mondrian/": change = 6905]
  • Loading branch information
Richard Emberson committed Jun 14, 2006
1 parent 4cc9f05 commit df1bf7a
Showing 1 changed file with 92 additions and 10 deletions.
102 changes: 92 additions & 10 deletions src/main/mondrian/xmla/RowsetDefinition.java
View file
Expand Up @@ -1363,7 +1363,13 @@ public void unparse(XmlaResponse response) throws XmlaException {
for (int i = 0; i < catalogs.length; i++) {
DataSourcesConfig.Catalog dsCatalog = catalogs[i];

if (dsCatalog == null) {
continue;
}
String catalog = dsCatalog.cdata;
if (catalog == null) {
continue;
}

Connection connection = handler.getConnection(ds, catalog, role);
if (connection == null) {
Expand Down Expand Up @@ -1563,7 +1569,13 @@ public void unparse(XmlaResponse response) throws XmlaException {
for (int g = 0; g < catalogs.length; g++) {
DataSourcesConfig.Catalog dsCatalog = catalogs[g];

if (dsCatalog == null) {
continue;
}
String catalog = dsCatalog.cdata;
if (catalog == null) {
continue;
}

Connection connection = handler.getConnection(ds, catalog, role);
if (connection == null) {
Expand Down Expand Up @@ -2178,8 +2190,15 @@ public void unparse(XmlaResponse response) throws XmlaException {
for (int i = 0; i < catalogs.length; i++) {
DataSourcesConfig.Catalog dsCatalog = catalogs[i];

if (dsCatalog == null) {
continue;
}
String catalog = dsCatalog.cdata;
if (catalog == null) {
continue;
}
Connection connection =
handler.getConnection(ds, dsCatalog.cdata, role);
handler.getConnection(ds, catalog, role);

if (connection == null) {
continue;
Expand Down Expand Up @@ -2476,8 +2495,15 @@ public void unparse(XmlaResponse response) throws XmlaException {
for (int h = 0; h < catalogs.length; h++) {
DataSourcesConfig.Catalog dsCatalog = catalogs[h];

if (dsCatalog == null) {
continue;
}
String catalog = dsCatalog.cdata;
if (catalog == null) {
continue;
}
Connection connection =
handler.getConnection(ds, dsCatalog.cdata, role);
handler.getConnection(ds, catalog, role);
if (connection == null) {
continue;
}
Expand Down Expand Up @@ -2792,8 +2818,15 @@ public void unparse(XmlaResponse response) throws XmlaException {
for (int h = 0; h < catalogs.length; h++) {
DataSourcesConfig.Catalog dsCatalog = catalogs[h];

if (dsCatalog == null) {
continue;
}
String catalog = dsCatalog.cdata;
if (catalog == null) {
continue;
}
Connection connection =
handler.getConnection(ds, dsCatalog.cdata, role);
handler.getConnection(ds, catalog, role);
if (connection == null) {
continue;
}
Expand Down Expand Up @@ -3056,8 +3089,15 @@ public void unparse(XmlaResponse response) throws XmlaException {
for (int h = 0; h < catalogs.length; h++) {
DataSourcesConfig.Catalog dsCatalog = catalogs[h];

if (dsCatalog == null) {
continue;
}
String catalog = dsCatalog.cdata;
if (catalog == null) {
continue;
}
Connection connection =
handler.getConnection(ds, dsCatalog.cdata, role);
handler.getConnection(ds, catalog, role);
if (connection == null) {
continue;
}
Expand Down Expand Up @@ -3359,8 +3399,15 @@ public void unparse(XmlaResponse response) throws XmlaException {
for (int h = 0; h < catalogs.length; h++) {
DataSourcesConfig.Catalog dsCatalog = catalogs[h];

if (dsCatalog == null) {
continue;
}
String catalog = dsCatalog.cdata;
if (catalog == null) {
continue;
}
Connection connection =
handler.getConnection(ds, dsCatalog.cdata, role);
handler.getConnection(ds, catalog, role);
if (connection == null) {
continue;
}
Expand Down Expand Up @@ -3696,8 +3743,15 @@ public void unparse(XmlaResponse response) throws XmlaException {
for (int h = 0; h < catalogs.length; h++) {
DataSourcesConfig.Catalog dsCatalog = catalogs[h];

if (dsCatalog == null) {
continue;
}
String catalog = dsCatalog.cdata;
if (catalog == null) {
continue;
}
Connection connection =
handler.getConnection(ds, dsCatalog.cdata, role);
handler.getConnection(ds, catalog, role);
if (connection == null) {
continue;
}
Expand Down Expand Up @@ -3999,8 +4053,15 @@ public void unparse(XmlaResponse response) throws XmlaException {
for (int h = 0; h < catalogs.length; h++) {
DataSourcesConfig.Catalog dsCatalog = catalogs[h];

if (dsCatalog == null) {
continue;
}
String catalog = dsCatalog.cdata;
if (catalog == null) {
continue;
}
Connection connection =
handler.getConnection(ds, dsCatalog.cdata, role);
handler.getConnection(ds, catalog, role);
if (connection == null) {
continue;
}
Expand Down Expand Up @@ -4277,8 +4338,15 @@ public void unparse(XmlaResponse response) throws XmlaException {
for (int h = 0; h < catalogs.length; h++) {
DataSourcesConfig.Catalog dsCatalog = catalogs[h];

if (dsCatalog == null) {
continue;
}
String catalog = dsCatalog.cdata;
if (catalog == null) {
continue;
}
Connection connection =
handler.getConnection(ds, dsCatalog.cdata, role);
handler.getConnection(ds, catalog, role);
if (connection == null) {
continue;
}
Expand Down Expand Up @@ -4623,8 +4691,15 @@ public void unparse(XmlaResponse response) throws XmlaException {
for (int h = 0; h < catalogs.length; h++) {
DataSourcesConfig.Catalog dsCatalog = catalogs[h];

if (dsCatalog == null) {
continue;
}
String catalog = dsCatalog.cdata;
if (catalog == null) {
continue;
}
Connection connection =
handler.getConnection(ds, dsCatalog.cdata, role);
handler.getConnection(ds, catalog, role);
if (connection == null) {
continue;
}
Expand Down Expand Up @@ -5093,8 +5168,15 @@ public void unparse(XmlaResponse response) throws XmlaException {
for (int h = 0; h < catalogs.length; h++) {
DataSourcesConfig.Catalog dsCatalog = catalogs[h];

if (dsCatalog == null) {
continue;
}
String catalog = dsCatalog.cdata;
if (catalog == null) {
continue;
}
Connection connection =
handler.getConnection(ds, dsCatalog.cdata, role);
handler.getConnection(ds, catalog, role);
if (connection == null) {
continue;
}
Expand Down

0 comments on commit df1bf7a

Please sign in to comment.