From 4498c4e774e34180e0e3bdfa0d6aaf11a097b029 Mon Sep 17 00:00:00 2001
From: chenson42 <chenson42@gmail.com>
Date: Thu, 6 Nov 2014 01:39:30 +0000
Subject: [PATCH] 0002054: NullPointerException happens during file sync pull

---
 .../symmetric/service/impl/FileSyncService.java | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncService.java
index 3c02325d61..29c05f8009 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncService.java
@@ -637,13 +637,16 @@ protected List<IncomingBatch> processZip(InputStream is, String sourceNodeId,
 
         Set<Long> batchIds = new TreeSet<Long>();
         String[] files = unzipDir.list(DirectoryFileFilter.INSTANCE);
-        for (int i = 0; i < files.length; i++) {
-            try {
-                batchIds.add(Long.parseLong(files[i]));
-            } catch (NumberFormatException e) {
-                log.error(
-                        "Unexpected directory name.  Expected a number representing a batch id.  Instead the directory was named '{}'",
-                        files[i]);
+        
+        if (files != null) {
+            for (int i = 0; i < files.length; i++) {
+                try {
+                    batchIds.add(Long.parseLong(files[i]));
+                } catch (NumberFormatException e) {
+                    log.error(
+                            "Unexpected directory name.  Expected a number representing a batch id.  Instead the directory was named '{}'",
+                            files[i]);
+                }
             }
         }