Skip to content

Commit f720d60

Browse files
ludochgae-java-bot
authored andcommitted
Fix header name comparison with ignore case to fix #485. Somewhere outside of the Java runtime, a change in a backend system returned lower case headers...
PiperOrigin-RevId: 889607617 Change-Id: I584aef4a4e960019cfd09cec46b7d28f15835e2d
1 parent 0e531b9 commit f720d60

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

api_dev/src/main/java/com/google/appengine/tools/development/testing/LocalTaskQueueTestConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,10 @@ public int execute(URLFetchServicePb.URLFetchRequest req) {
261261
ByteString payload = null;
262262
for (URLFetchServicePb.URLFetchRequest.Header header : req.getHeaderList()) {
263263
// See if this is a DeferredTask.
264-
if (header.getKey().equals("content-type") &&
264+
if (header.getKey().equalsIgnoreCase("content-type") &&
265265
DeferredTaskContext.RUNNABLE_TASK_CONTENT_TYPE.equals(header.getValue())) {
266266
payload = req.getPayload();
267-
} else if (CURRENT_NAMESPACE_HEADER.equals(header.getKey())) {
267+
} else if (CURRENT_NAMESPACE_HEADER.equalsIgnoreCase(header.getKey())) {
268268
requestNamespace = header.getValue();
269269
}
270270
}

api_dev/src/main/java/com/google/appengine/tools/development/testing/jakarta/LocalTaskQueueTestConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ public int execute(URLFetchServicePb.URLFetchRequest req) {
264264
ByteString payload = null;
265265
for (URLFetchServicePb.URLFetchRequest.Header header : req.getHeaderList()) {
266266
// See if this is a DeferredTask.
267-
if (header.getKey().equals("content-type") &&
267+
if (header.getKey().equalsIgnoreCase("content-type") &&
268268
DeferredTaskContext.RUNNABLE_TASK_CONTENT_TYPE.equals(header.getValue())) {
269269
payload = req.getPayload();
270-
} else if (CURRENT_NAMESPACE_HEADER.equals(header.getKey())) {
270+
} else if (CURRENT_NAMESPACE_HEADER.equalsIgnoreCase(header.getKey())) {
271271
requestNamespace = header.getValue();
272272
}
273273
}

api_dev/src/test/java/com/google/appengine/api/taskqueue/TaskQueueTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,9 @@ static class MockQueueBulkAddApiHelper extends QueueApiHelper {
327327
if (DEFAULT_NAMESPACE_HEADER.equals(header.getKey())
328328
|| CURRENT_NAMESPACE_HEADER.equals(header.getKey())) {
329329
return 1; // Sort namespace headers after user-specified headers.
330-
} else if ("content-type".equals(header.getKey().toStringUtf8())
330+
} else if ("content-type".equalsIgnoreCase(header.getKey().toStringUtf8())
331331
&& "application/x-www-form-urlencoded"
332-
.equals(header.getValue().toStringUtf8())) {
332+
.equalsIgnoreCase(header.getValue().toStringUtf8())) {
333333
return 2; // Sort default content-type header last.
334334
} else {
335335
return 0; // Let everything else remain in the original order (given a stable

runtime/impl/src/main/java/com/google/apphosting/runtime/ApiProxyImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -973,9 +973,9 @@ public static final class EnvironmentImpl implements ApiProxy.EnvironmentWithTra
973973
.getHeadersList()
974974
.forEach(
975975
header -> {
976-
if (header.getKey().equals(DEFAULT_NAMESPACE_HEADER)) {
976+
if (header.getKey().equalsIgnoreCase(DEFAULT_NAMESPACE_HEADER)) {
977977
attributes.put(APPS_NAMESPACE_KEY, header.getValue());
978-
} else if (header.getKey().equals(CURRENT_NAMESPACE_HEADER)) {
978+
} else if (header.getKey().equalsIgnoreCase(CURRENT_NAMESPACE_HEADER)) {
979979
attributes.put(CURRENT_NAMESPACE_KEY, header.getValue());
980980
}
981981
});

0 commit comments

Comments
 (0)