Author: tomekr
Date: Fri Jan 31 13:19:33 2020
New Revision: 1873415
URL: http://svn.apache.org/viewvc?rev=1873415&view=rev
Log:
OAK-8889: NPE in the oak-run console az:*
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java?rev=1873415&r1=1873414&r2=1873415&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentTarFixtureProvider.java
Fri Jan 31 13:19:33 2020
@@ -26,8 +26,10 @@ import static org.apache.jackrabbit.oak.
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);
}