Author: vhalbert(a)redhat.com
Date: 2009-10-14 19:42:59 -0400 (Wed, 14 Oct 2009)
New Revision: 1531
Modified:
trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java
Log:
Teiid 773 - fix a NPE and the logic when there are multiple models that are to be
assigned to the same datasource. example is bqt (3 models).
Modified:
trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java
===================================================================
---
trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java 2009-10-14
23:40:04 UTC (rev 1530)
+++
trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceFactory.java 2009-10-14
23:42:59 UTC (rev 1531)
@@ -1,5 +1,6 @@
package org.teiid.test.framework.datasource;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -148,6 +149,8 @@
excludedDBTypes = new HashSet<String>(eprops.size());
excludedDBTypes.addAll(eprops);
System.out.println("EXCLUDE datasources: " + excludeprop);
+ } else {
+ excludedDBTypes = Collections.EMPTY_SET;
}
@@ -313,14 +316,8 @@
+ " was not found in the allDatasources map");
}
- } else {
- throw new QueryTestFailedException("Model:id " + modelName
- + ":" + datasourceid
- + " did not map to the usedatasources: "
- + useDS.toString());
+ }
- }
-
} else {
Show replies by thread