[FLINK-1891] Add check for empty storageDirectory path This closes #601
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a0147c49 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a0147c49 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a0147c49 Branch: refs/heads/master Commit: a0147c493cf210a0914c35200ebfacd47515374d Parents: 45e680c Author: hongsibao <hongsi...@huawei.com> Authored: Wed Apr 15 18:15:27 2015 +0800 Committer: Fabian Hueske <fhue...@apache.org> Committed: Tue Apr 21 19:03:16 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/flink/runtime/blob/BlobUtils.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/a0147c49/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java index 69687da..b7cd42e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobUtils.java @@ -64,15 +64,19 @@ public class BlobUtils { * @return the storage directory used by a BLOB service */ static File initStorageDirectory(String storageDirectory) { - File baseDir = storageDirectory != null ? - new File(storageDirectory) : - new File(System.getProperty("java.io.tmpdir")); + File baseDir; + if (storageDirectory == null || storageDirectory.trim().isEmpty()) { + baseDir = new File(System.getProperty("java.io.tmpdir")); + } + else { + baseDir = new File(storageDirectory); + } File storageDir; final int MAX_ATTEMPTS = 10; int attempt; - for(attempt = 0; attempt < MAX_ATTEMPTS; attempt++){ + for(attempt = 0; attempt < MAX_ATTEMPTS; attempt++) { storageDir = new File(baseDir, String.format( "blobStore-%s", UUID.randomUUID().toString()));
