JBIDE-18405: Fix

jbosstools · Sep 23, 2014 · d2df2c9 · d2df2c9
1 parent c6d20ca
commit d2df2c9
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/...ols.tests.installation/src/org/jboss/tools/tests/installation/InstallFromCentralTest.java b/...ols.tests.installation/src/org/jboss/tools/tests/installation/InstallFromCentralTest.java
@@ -145,11 +145,19 @@ public String getFailureMessage() {
 				if (check.getText() == null || !check.getText().toLowerCase().endsWith(" installed")) {
 					DataRetriever dataRetriever = new DataRetriever(check.widget, "connectorId");
 					Display.getDefault().syncExec(dataRetriever);
-					if (!this.excludedConnectors.isEmpty() && !this.excludedConnectors.contains(dataRetriever.getResult())) {
-						check.click();
-					}
-					if (!this.includedConnectors.isEmpty() && this.includedConnectors.contains(dataRetriever.getResult())) {
-						check.click();
+					String connectorId = (String) dataRetriever.getResult();
+					if (connectorId != null) {
+						boolean included = false;
+						if (!this.includedConnectors.isEmpty()) {
+							included = this.includedConnectors.contains(connectorId);
+						} else if (!this.excludedConnectors.isEmpty()) {
+							included = !this.excludedConnectors.contains(connectorId);
+						} else { // default includes everything 
+							included = true;
+						}
+						if (included) {
+							check.click();
+						}
 					}
 				}
 				i++;