From 10690f92930787ea71a8a28697252fd400818575 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Tue, 3 Feb 2015 20:20:59 -0800 Subject: [PATCH] Handle null return value from File.listFiles This matches the behavior of other call sites. Fixes andrewgaul/s3proxy#39. --- .../strategy/internal/FilesystemStorageStrategyImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java index 03c95e8841..325b22c2b9 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java @@ -673,6 +673,9 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy { private static void populateBlobKeysInContainer(File directory, Set blobNames, Function function) { File[] children = directory.listFiles(); + if (children == null) { + return; + } for (File child : children) { if (child.isFile()) { blobNames.add( function.apply(child.getAbsolutePath()) );