Skip to content

Commit

Permalink
fixing merge discrepancy
Browse files Browse the repository at this point in the history
  • Loading branch information
dan-huenecke committed Jun 5, 2024
1 parent c0719a5 commit 7d57419
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ public static Platform getPlatformProto(
} else if (spawn.getExecutionPlatform() != null
&& !Strings.isNullOrEmpty(spawn.getExecutionPlatform().remoteExecutionProperties())) {
properties = new HashMap<>();
// Try and get the platform info from the execution properties.
// Try and get the platform info from the execution properties. This is pretty inefficient; it
// would be better to store the parsed properties instead of the String text proto.
try {
Platform.Builder platformBuilder = Platform.newBuilder();
TextFormat.getParser()
Expand Down

0 comments on commit 7d57419

Please sign in to comment.