From: James Moger <james.moger@gitblit.com>
Date: Wed, 25 Nov 2015 13:50:10 +0000 (-0500)
Subject: Handle possible NPE when extracting WAR resources into a new directory
X-Git-Tag: v1.8.0~34
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d1eb00e7e98ec4d932a632e52d336c43a4351cb4;p=gitblit.git

Handle possible NPE when extracting WAR resources into a new directory
---

diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java
index fb8f6b9d..750da796 100644
--- a/src/main/java/com/gitblit/servlet/GitblitContext.java
+++ b/src/main/java/com/gitblit/servlet/GitblitContext.java
@@ -24,6 +24,7 @@ import java.io.OutputStream;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -455,7 +456,12 @@ public class GitblitContext extends GuiceServletContextListener {
 	}
 
 	protected void extractResources(ServletContext context, String path, File toDir) {
-		for (String resource : context.getResourcePaths(path)) {
+		Set<String> resources = context.getResourcePaths(path);
+		if (resources == null) {
+			logger.warn("There are no WAR resources to extract from {}", path);
+			return;
+		}
+		for (String resource : resources) {
 			// extract the resource to the directory if it does not exist
 			File f = new File(toDir, resource.substring(path.length()));
 			if (!f.exists()) {