summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2013-01-01 18:22:55 (EST)
committerGerrit Code Review @ Eclipse.org2013-01-06 13:45:45 (EST)
commit0ea1e6962416ad45d3b12bac12236a496d0686ba (patch)
tree4550b033d262ac16cf8668f6b53e4b4a295e09ca
parentb06968d407bd82a199c5af526b2a2bd5eab2a94c (diff)
downloadorg.eclipse.mylyn.commons-0ea1e6962416ad45d3b12bac12236a496d0686ba.zip
org.eclipse.mylyn.commons-0ea1e6962416ad45d3b12bac12236a496d0686ba.tar.gz
org.eclipse.mylyn.commons-0ea1e6962416ad45d3b12bac12236a496d0686ba.tar.bz2
394053: skip empty configurationsrefs/changes/17/9417/2
Skip over empty configurations in the services file. Change-Id: I8348ebce6dd098346f65f72811547b83098b73a5 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=394053
-rw-r--r--org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestConfiguration.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestConfiguration.java b/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestConfiguration.java
index b34a0f0..fdc4f0c 100644
--- a/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestConfiguration.java
+++ b/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/TestConfiguration.java
@@ -134,7 +134,9 @@ public class TestConfiguration {
List<FixtureConfiguration> configurations = getConfigurations(url + "/cgi-bin/services");
if (configurations != null) {
for (FixtureConfiguration configuration : configurations) {
- configuration.setUrl(url + configuration.getUrl());
+ if (configuration != null) {
+ configuration.setUrl(url + configuration.getUrl());
+ }
}
return loadFixtures(configurations, clazz, fixtureType);
}
@@ -145,7 +147,7 @@ public class TestConfiguration {
String fixtureType) {
List<T> result = new ArrayList<T>();
for (FixtureConfiguration configuration : configurations) {
- if (fixtureType.equals(configuration.getType())) {
+ if (configuration != null && fixtureType.equals(configuration.getType())) {
try {
Constructor<T> constructor = clazz.getConstructor(FixtureConfiguration.class);
result.add(constructor.newInstance(configuration));