Skip to content

Commit

Permalink
MONDRIAN: Fix checkFile exceptions.
Browse files Browse the repository at this point in the history
[git-p4: depot-paths = "//open/mondrian/": change = 14480]
  • Loading branch information
julianhyde committed Jul 23, 2011
1 parent 3e4f3ba commit 0dca393
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/main/mondrian/olap4j/EmptyResultSet.java
Expand Up @@ -143,7 +143,7 @@ public boolean wasNull() throws SQLException {

public String getString(int columnIndex) throws SQLException {
final Object result = getColumn(columnIndex - 1);
return result == null ? null: String.valueOf(result);
return result == null ? null : String.valueOf(result);
}

public boolean getBoolean(int columnIndex) throws SQLException {
Expand Down Expand Up @@ -227,7 +227,7 @@ public InputStream getBinaryStream(int columnIndex) throws SQLException {

public String getString(String columnLabel) throws SQLException {
final Object result = getColumn(columnLabel);
return result == null ? null: String.valueOf(result);
return result == null ? null : String.valueOf(result);
}

public boolean getBoolean(String columnLabel) throws SQLException {
Expand Down
Expand Up @@ -2,7 +2,7 @@
// This software is subject to the terms of the Eclipse Public License v1.0
// Agreement, available at the following URL:
// http://www.eclipse.org/legal/epl-v10.html.
// Copyright (C) 2006-2010 Julian Hyde
// Copyright (C) 2006-2011 Julian Hyde
// All Rights Reserved.
// You must accept the terms of that agreement to use this software.
*/
Expand Down Expand Up @@ -304,8 +304,8 @@ public void testAutoReloadDataSources() throws Exception {

// Wait for it to auto-reload.
Thread.sleep(
MondrianProperties.instance()
.XmlaSchemaRefreshInterval.get() + 1000);
MondrianProperties.instance().XmlaSchemaRefreshInterval.get()
+ 1000);

assertTrue(
finder.containsCatalog(DATASOURCE_1_NAME, CATALOG_0_NAME));
Expand Down

0 comments on commit 0dca393

Please sign in to comment.