From 2b945323d2b4cf7dfdf988b9b04c4fb75e416206 Mon Sep 17 00:00:00 2001 From: lpino Date: Thu, 21 Jun 2018 08:35:40 -0700 Subject: Fix NoSuchElementException when BuildEventArtifactUploaderMap has no elements. When there are no uploaders in BuildEventArtifactUploaderMap then we should use the BuildEventArtifactUploader.LOCAL_FILES_UPLOADER as a fallback. Added some unit tests as regression tests for the underlying issue. PiperOrigin-RevId: 201529578 --- .../build/lib/buildeventstream/BuildEventArtifactUploaderMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build') diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventArtifactUploaderMap.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventArtifactUploaderMap.java index 8987def882..e9f611ab9a 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventArtifactUploaderMap.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventArtifactUploaderMap.java @@ -30,7 +30,7 @@ public class BuildEventArtifactUploaderMap { } public BuildEventArtifactUploader select(@Nullable String name) { - if (name == null) { + if (name == null && !uploaders.values().isEmpty()) { // TODO(b/110235226): We currently choose the strategy with alphabetically first strategy, // which happens to be backwards-compatible; we need to set // experimental_build_event_upload_strategy to appropriate default values instead, and then -- cgit v1.2.3