Author: tomekr
Date: Mon Aug 6 09:36:32 2018
New Revision: 1837498
URL: http://svn.apache.org/viewvc?rev=1837498&view=rev
Log:
OAK-6922: Azure support for the segment-tar
- ignore empty connection string
Modified:
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreService.java
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/Configuration.java
Modified:
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreService.java?rev=1837498&r1=1837497&r2=1837498&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentStoreService.java
Mon Aug 6 09:36:32 2018
@@ -70,7 +70,7 @@ public class AzureSegmentStoreService {
private static SegmentNodeStorePersistence
createAzurePersistence(Configuration configuration) throws IOException {
try {
StringBuilder connectionString = new StringBuilder();
- if (configuration.connectionURL() != null) {
+ if (configuration.connectionURL() != null &&
!configuration.connectionURL().isEmpty()) {
connectionString.append(configuration.connectionURL());
} else {
connectionString.append("DefaultEndpointsProtocol=https;");
Modified:
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/Configuration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/Configuration.java?rev=1837498&r1=1837497&r2=1837498&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/Configuration.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/Configuration.java
Mon Aug 6 09:36:32 2018
@@ -55,5 +55,5 @@ import static org.apache.jackrabbit.oak.
name = "Azure connection URL (optional)",
description = "Connection URL to be used to connect to the Azure
Storage. " +
"Setting it will override the accountName, containerName
and accessKey properties.")
- String connectionURL();
+ String connectionURL() default "";
}
\ No newline at end of file
