Fix call to /batch/project WS and handling of errors

1 files changed, 20 insertions, 2 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java b/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java
index fd0b0e0e4ec..6f4f10c74fa 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/repository/DefaultProjectRepositoriesLoader.java
@@ -19,13 +19,18 @@
  */
 package org.sonar.batch.repository;
 
+import org.sonar.api.utils.HttpDownloader.HttpException;
+
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
 import java.util.Map;
+
 import javax.annotation.Nullable;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.mutable.MutableBoolean;
 import org.slf4j.Logger;
@@ -55,7 +60,11 @@ public class DefaultProjectRepositoriesLoader implements ProjectRepositoriesLoad
       }
       return processStream(result.get(), projectKey);
     } catch (IllegalStateException e) {
-      LOG.debug("Couldn't get project repositories - continuing without it", e);
+      if (shouldThrow(e)) {
+        throw e;
+      }
+
+      LOG.debug("Project repository not available - continuing without it", e);
       return new ProjectRepositories();
     }
   }
@@ -66,11 +75,20 @@ public class DefaultProjectRepositoriesLoader implements ProjectRepositoriesLoad
     builder.append(BATCH_PROJECT_URL)
       .append("?key=").append(BatchUtils.encodeForUrl(projectKey));
     if (issuesMode) {
-      builder.append("&issues=true");
+      builder.append("&issues_mode=true");
     }
     return builder.toString();
   }
 
+  private static boolean shouldThrow(Exception e) {
+    if (e.getCause() != null && e.getCause() instanceof HttpException) {
+      HttpException http = (HttpException) e.getCause();
+      return http.getResponseCode() != 404;
+    }
+
+    return false;
+  }
+
   private static ProjectRepositories processStream(InputStream is, String projectKey) {
     try {
       WsProjectResponse response = WsProjectResponse.parseFrom(is);