From: Julien HENRY <julien.henry@sonarsource.com>
Date: Fri, 21 Nov 2014 16:13:41 +0000 (+0100)
Subject: SONAR-5827 Fix NPE for languages with no source colorizer
X-Git-Tag: 5.0-RC1~261
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e667d941dd0f6155982140bdedd0208fd6cf9674;p=sonarqube.git

SONAR-5827 Fix NPE for languages with no source colorizer
---

diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/CodeColorizers.java b/sonar-batch/src/main/java/org/sonar/batch/source/CodeColorizers.java
index a1d3ce9c572..1bc0f315b6f 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/source/CodeColorizers.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/source/CodeColorizers.java
@@ -29,6 +29,8 @@ import org.sonar.api.web.CodeColorizerFormat;
 import org.sonar.batch.highlighting.SyntaxHighlightingData;
 import org.sonar.colorizer.Tokenizer;
 
+import javax.annotation.CheckForNull;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -63,11 +65,12 @@ public class CodeColorizers implements BatchComponent {
     this(Lists.<CodeColorizerFormat>newArrayList());
   }
 
+  @CheckForNull
   public SyntaxHighlightingData toSyntaxHighlighting(File file, String encoding, String language) {
     CodeColorizerFormat format = byLang.get(language);
     List<Tokenizer> tokenizers;
     if (format == null) {
-      tokenizers = null;
+      return null;
     } else {
       tokenizers = format.getTokenizers();
     }