From 79307923ad49192c0c05475fe2162c113047145d Mon Sep 17 00:00:00 2001
From: Winston Li <winston.li12@imperial.ac.uk>
Date: Mon, 9 Mar 2015 22:35:40 +0000
Subject: [PATCH] Allow null directories in directory deletion methods.

---
 .../java/uk/ac/ic/wlgitbridge/util/Util.java  | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/util/Util.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/util/Util.java
index b9f57b90db..abc33f14a7 100644
--- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/util/Util.java
+++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/util/Util.java
@@ -129,22 +129,28 @@ public class Util {
     }
 
     public static void deleteDirectory(File directory) {
-        deleteInDirectory(directory);
-        directory.delete();
+        if (directory != null) {
+            deleteInDirectory(directory);
+            directory.delete();
+        }
     }
 
     public static void deleteInDirectory(File directory) {
-        deleteInDirectoryApartFrom(directory);
+        if (directory != null) {
+            deleteInDirectoryApartFrom(directory);
+        }
     }
 
     public static void deleteInDirectoryApartFrom(File directory, String... apartFrom) {
-        Set<String> excluded = new HashSet<String>(Arrays.asList(apartFrom));
-        for (File file : directory.listFiles()) {
-            if (!excluded.contains(file.getName())) {
-                if (file.isDirectory()) {
-                    deleteInDirectory(file);
+        if (directory != null) {
+            Set<String> excluded = new HashSet<String>(Arrays.asList(apartFrom));
+            for (File file : directory.listFiles()) {
+                if (!excluded.contains(file.getName())) {
+                    if (file.isDirectory()) {
+                        deleteInDirectory(file);
+                    }
+                    file.delete();
                 }
-                file.delete();
             }
         }
     }