Make worker JSON protocol properly ignore unknown fields.

RELNOTES: None. PiperOrigin-RevId: 381428739
Bencodes · Jun 25, 2021 · 1a89ce1 · 1a89ce1
1 parent 7b548ed
commit 1a89ce1
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/worker/JsonWorkerMessageProcessor.java b/src/main/java/com/google/devtools/build/lib/worker/JsonWorkerMessageProcessor.java
@@ -79,7 +79,10 @@ private static ImmutableList<Input> readInputs(JsonReader reader) throws IOExcep
             path = reader.nextString();
             break;
           default:
-            continue;
+            // As per https://docs.bazel.build/versions/main/creating-workers.html#work-responses,
+            // unknown fields are ignored.
+            reader.skipValue();
+            break;
         }
       }
       reader.endObject();
@@ -125,6 +128,9 @@ public WorkRequest readWorkRequest() throws IOException {
             requestId = reader.nextInt();
             break;
           default:
+            // As per https://docs.bazel.build/versions/main/creating-workers.html#work-responses,
+            // unknown fields are ignored.
+            reader.skipValue();
             break;
         }
       }