Merge pull request #59 from GoogleCloudPlatform/main

Test for null value before using field.getHeader().
GoogleCloudPlatform · Oct 9, 2023 · 2cf0d33 · 2cf0d33
2 parents 8a7bf84 + a296343
commit 2cf0d33
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -21,9 +21,9 @@ on:
   pull_request:
     branches:
       - main
-
-permissions:
-  contents: read
+  push:
+    branches-ignore:
+      - 'dependabot/**'
 
 jobs:
   build:

diff --git a/kokoro/gcp_ubuntu/publish_javadoc.sh b/kokoro/gcp_ubuntu/publish_javadoc.sh
@@ -19,7 +19,7 @@ set -e
 shopt -s globstar
 
 setup_docuploader() {
- curl -fsSL --retry 10 -o /tmp/jar1.jar https://github.com/googleapis/java-docfx-doclet/releases/download/1.8.0/docfx-doclet-1.8.0-jar-with-dependencies.jar
+ curl -fsSL --retry 10 -o /tmp/jar1.jar https://github.com/googleapis/java-docfx-doclet/releases/download/1.9.0/docfx-doclet-1.9.0-jar-with-dependencies.jar
  # Update Python 3 and Maven
  sudo apt-get update
  sudo apt-get install -y python3 python3-pip maven

diff --git a/kokoro/gcp_ubuntu/release.sh b/kokoro/gcp_ubuntu/release.sh
@@ -106,12 +106,9 @@ export JAVA_HOME="$(update-java-alternatives -l | grep "1.17" | head -n 1 | tr -
 # Make sure `JAVA_HOME` is set.
 echo "JAVA_HOME = $JAVA_HOME"
 
-# Install Maven.
-sudo apt-get -qq update && sudo apt-get -qq install -y maven
-
 # compile all packages
 echo "Calling release:prepare and release:perform."
-mvn release:prepare release:perform -B -q --settings=../settings.xml -DskipTests -Darguments=-DskipTests -Dgpg.homedir=${GNUPGHOME} -Dgpg.passphrase=${GPG_PASSPHRASE}
+./mvnw release:prepare release:perform -B -q --settings=../settings.xml -DskipTests -Darguments=-DskipTests -Dgpg.homedir=${GNUPGHOME} -Dgpg.passphrase=${GPG_PASSPHRASE}
 
 git remote set-url origin https://gae-java-bot:${GAE_JAVA_BOT_GITHUB_TOKEN}@github.com/GoogleCloudPlatform/appengine-java-standard
 echo "Doing git tag and push."

diff --git a/..._impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/CoreSizeLimitHandler.java b/..._impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/CoreSizeLimitHandler.java
@@ -79,7 +79,7 @@ public boolean handle(Request request, Response response, Callback callback) thr
       @Override
       public HttpField onAddField(HttpField field)
       {
-        if (field.getHeader().is(HttpHeader.CONTENT_LENGTH.asString()))
+        if ((field.getHeader()!=null) && (field.getHeader().is(HttpHeader.CONTENT_LENGTH.asString())))
         {
           long contentLength = field.getLongValue();
           if (_responseLimit > 0 && contentLength > _responseLimit)

diff --git a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SpringBootTest.java b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SpringBootTest.java
@@ -39,7 +39,7 @@ public static void beforeClass() throws IOException, InterruptedException {
     File currentDirectory = new File("").getAbsoluteFile();
     Process process =
         new ProcessBuilder(
-                "mvn",
+                "../../mvnw",
                 "install",
                 "appengine:stage",
                 "-f",