kopia lustrzana https://github.com/gaul/s3proxy
Allow null localIdentify with bucket locators
This can be null when using none authorization. Regression from
4976e170c3
. Fixes #781.
pull/785/head
rodzic
1a08bc25ad
commit
b6ce601c3b
|
@ -43,6 +43,7 @@ import com.google.common.base.Strings;
|
||||||
import com.google.common.base.Supplier;
|
import com.google.common.base.Supplier;
|
||||||
import com.google.common.collect.ImmutableBiMap;
|
import com.google.common.collect.ImmutableBiMap;
|
||||||
import com.google.common.collect.ImmutableMap;
|
import com.google.common.collect.ImmutableMap;
|
||||||
|
import com.google.common.collect.Maps;
|
||||||
import com.google.common.io.MoreFiles;
|
import com.google.common.io.MoreFiles;
|
||||||
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||||
|
|
||||||
|
@ -154,7 +155,7 @@ public final class Main {
|
||||||
globLocators.put(
|
globLocators.put(
|
||||||
FileSystems.getDefault().getPathMatcher(
|
FileSystems.getDefault().getPathMatcher(
|
||||||
"glob:" + bucketLocator),
|
"glob:" + bucketLocator),
|
||||||
Map.entry(localIdentity, blobStore));
|
Maps.immutableEntry(localIdentity, blobStore));
|
||||||
} else {
|
} else {
|
||||||
System.err.println("Multiple definitions of the " +
|
System.err.println("Multiple definitions of the " +
|
||||||
"bucket locator: " + bucketLocator);
|
"bucket locator: " + bucketLocator);
|
||||||
|
|
Ładowanie…
Reference in New Issue