From b6ce601c3b4cef886e8c95aa84b02f00120c3609 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sat, 8 Feb 2025 12:46:58 -0800 Subject: [PATCH] Allow null localIdentify with bucket locators This can be null when using none authorization. Regression from 4976e170c3c068275201a79d329f953f685fb808. Fixes #781. --- src/main/java/org/gaul/s3proxy/Main.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gaul/s3proxy/Main.java b/src/main/java/org/gaul/s3proxy/Main.java index 86fcd11..c7ffe4d 100644 --- a/src/main/java/org/gaul/s3proxy/Main.java +++ b/src/main/java/org/gaul/s3proxy/Main.java @@ -43,6 +43,7 @@ import com.google.common.base.Strings; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import com.google.common.io.MoreFiles; import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -154,7 +155,7 @@ public final class Main { globLocators.put( FileSystems.getDefault().getPathMatcher( "glob:" + bucketLocator), - Map.entry(localIdentity, blobStore)); + Maps.immutableEntry(localIdentity, blobStore)); } else { System.err.println("Multiple definitions of the " + "bucket locator: " + bucketLocator);