[jackrabbit-oak] branch 1.22 updated: OAK-8889: NPE in the oak-run console az:*

[reschke]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/1.22 by this push:
     new f794ae32c7 OAK-8889: NPE in the oak-run console az:*
f794ae32c7 is described below

commit f794ae32c7de845b13ebd3e1dd809bc87880dc72
Author: Tomasz Rekawek <tom...@apache.org>
AuthorDate: Fri Jan 31 13:19:33 2020 +0000

    OAK-8889: NPE in the oak-run console az:*
    
    git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1873415 
13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
 
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
index fbfbbda963..644bf1f36c 100644
--- 
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
+++ 
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
@@ -26,8 +26,10 @@ import static 
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.getServic
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 
 import com.google.common.io.Closer;
+import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
 import org.apache.jackrabbit.oak.segment.azure.tool.ToolUtils;
 import org.apache.jackrabbit.oak.segment.file.FileStore;
@@ -53,7 +55,9 @@ class SegmentTarFixtureProvider {
         if (segmentStoreType == ToolUtils.SegmentStoreType.AZURE) {
             SegmentNodeStorePersistence segmentNodeStorePersistence =
                 ToolUtils.newSegmentNodeStorePersistence(segmentStoreType, 
pathOrUri);
-            builder = fileStoreBuilder(new 
File(options.getTempDirectory())).withCustomPersistence(segmentNodeStorePersistence);
+            File tempDir = 
Files.createTempDirectory("azure-segment-store").toFile();
+            closer.register(() -> FileUtils.deleteQuietly(tempDir));
+            builder = 
fileStoreBuilder(tempDir).withCustomPersistence(segmentNodeStorePersistence);
         } else {
             builder = fileStoreBuilder(new 
File(pathOrUri)).withMaxFileSize(256);
         }