Fix FindBugs warning on a potential npe

Change-Id: Ic52b7e25f886d72e19c3a3e55abd4c6b8a835f29

1 files changed, 6 insertions, 3 deletions

diff --git a/jack/src/com/android/jack/experimental/incremental/JackIncremental.java b/jack/src/com/android/jack/experimental/incremental/JackIncremental.java
index 2b9c90c3..157863db 100644
--- a/jack/src/com/android/jack/experimental/incremental/JackIncremental.java
+++ b/jack/src/com/android/jack/experimental/incremental/JackIncremental.java
@@ -286,10 +286,13 @@ public class JackIncremental extends CommandLine {
     }
 
     // Move imported jack files from import to classpath option
-    StringBuilder newClasspath = new StringBuilder(options.getClasspathAsString());
-    if (jackFilesFolder != null) {
+    assert jackFilesFolder != null;
+    StringBuilder newClasspath = new StringBuilder(jackFilesFolder.getAbsolutePath());
+
+    String oldClasspath = options.getClasspathAsString();
+    if (oldClasspath != null) {
       newClasspath.append(File.pathSeparator);
-      newClasspath.append(jackFilesFolder.getAbsolutePath());
+      newClasspath.append(oldClasspath);
     }
 
     List<File> jayceImport = options.getJayceImport();