Merge 438c8f4 into 981acfa

Pablissimo · Oct 27, 2016 · 1015f33 · 1015f33
2 parents 981acfa + 438c8f4
commit 1015f33
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 language: java
 jdk:
   - oraclejdk8
+
+addons:
+  artifacts: true
 
 after_success:
-  - mvn clean cobertura:cobertura coveralls:report
+  - mvn clean cobertura:cobertura coveralls:report
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>com.pablissimo.sonar</groupId>
   <artifactId>sonar-typescript-plugin</artifactId>
   <packaging>sonar-plugin</packaging>
-  <version>0.93-SNAPSHOT</version>
+  <version>0.94-SNAPSHOT</version>
 
   <name>TypeScript</name>
   <description>Analyse TypeScript projects</description>

diff --git a/src/main/java/com/pablissimo/sonar/LCOVParserImpl.java b/src/main/java/com/pablissimo/sonar/LCOVParserImpl.java
@@ -21,7 +21,6 @@
  */
 package com.pablissimo.sonar;
 
-import com.google.common.base.Objects;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -197,7 +196,7 @@ void addBranch(Integer lineNumber, String branchNumber, Integer taken) {
         branches.put(lineNumber, branchesForLine);
       }
       Integer currentValue = branchesForLine.get(branchNumber);
-      branchesForLine.put(branchNumber, Objects.firstNonNull(currentValue, 0) + taken);
+      branchesForLine.put(branchNumber, (currentValue == null ? 0 : currentValue) + taken);
     }
 
     void addLine(Integer lineNumber, Integer executionCount) {
@@ -235,4 +234,4 @@ private void checkLine(Integer lineNumber) {
     }
 
   }
-}
+}