From: Carl Myers <cmyers@palantir.com>
Date: Fri, 4 Nov 2011 13:42:12 +0000 (+0100)
Subject: Fix NPE when PATH environment variable is empty
X-Git-Tag: v1.2.0.201112221803-r~52
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F4528%2F5;p=jgit.git

Fix NPE when PATH environment variable is empty

Change-Id: Ic27d509cd5e2d6c855e7d355fc308399d9dc01c9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
index 7440fc9d1f..ac8d655015 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
@@ -244,7 +244,20 @@ public abstract class FS {
 		return new File(home).getAbsoluteFile();
 	}
 
+	/**
+	 * Searches the given path to see if it contains one of the given files.
+	 * Returns the first it finds. Returns null if not found or if path is null.
+	 *
+	 * @param path
+	 *            List of paths to search separated by File.pathSeparator
+	 * @param lookFor
+	 *            Files to search for in the given path
+	 * @return the first match found, or null
+	 **/
 	static File searchPath(final String path, final String... lookFor) {
+		if (path == null)
+			return null;
+
 		for (final String p : path.split(File.pathSeparator)) {
 			for (String command : lookFor) {
 				final File e = new File(p, command);