Make worker JSON protocol properly ignore unknown fields.

larsrc-google · copybara-github · commit 1a89ce1757e7 · 2021-06-25T02:23:11.000-07:00
RELNOTES: None.
PiperOrigin-RevId: 381428739
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;
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,10 @@ private static ImmutableList<Input> readInputs(JsonReader reader) throws IOExcep`
`79`	`79`	`path = reader.nextString();`
`80`	`80`	`break;`
`81`	`81`	`default:`
`82`		`- continue;`
	`82`	`+ // As per https://docs.bazel.build/versions/main/creating-workers.html#work-responses,`
	`83`	`+ // unknown fields are ignored.`
	`84`	`+ reader.skipValue();`
	`85`	`+ break;`
`83`	`86`	`}`
`84`	`87`	`}`
`85`	`88`	`reader.endObject();`
`@@ -125,6 +128,9 @@ public WorkRequest readWorkRequest() throws IOException {`
`125`	`128`	`requestId = reader.nextInt();`
`126`	`129`	`break;`
`127`	`130`	`default:`
	`131`	`+ // As per https://docs.bazel.build/versions/main/creating-workers.html#work-responses,`
	`132`	`+ // unknown fields are ignored.`
	`133`	`+ reader.skipValue();`
`128`	`134`	`break;`
`129`	`135`	`}`
`130`	`136`	`}`