Merge branch '2.18'

FasterXML · Sep 5, 2024 · f84193d · f84193d
2 parents 422cb7f + 450071b
commit f84193d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
@@ -30,7 +30,7 @@ jobs:
  dry-run: false
  language: jvm
  - name: Upload Crash
- uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+ uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
  if: failure() && steps.build.outcome == 'success'
  with:
  name: artifacts

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -27,12 +27,12 @@ jobs:
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL
- uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+ uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
  with:
  languages: ${{ matrix.language }}
 
  - name: Autobuild
- uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+ uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+ uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
diff --git a/.github/workflows/dep_build_v2.yml b/.github/workflows/dep_build_v2.yml
@@ -22,7 +22,7 @@ jobs:
  steps:
  - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
  - name: Set up JDK
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+ uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
  with:
  distribution: 'temurin'
  java-version: ${{ matrix.java_version }}

diff --git a/.github/workflows/dep_build_v3.yml b/.github/workflows/dep_build_v3.yml
@@ -24,7 +24,7 @@ jobs:
  with:
  ref: master
  - name: Set up JDK
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+ uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
  with:
  distribution: 'temurin'
  java-version: ${{ matrix.java_version }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -39,7 +39,7 @@ jobs:
  steps:
  - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
  - name: Set up JDK
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+ uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
  with:
  distribution: 'temurin'
  java-version: ${{ matrix.java_version }}

diff --git a/src/main/java/tools/jackson/databind/introspect/MemberKey.java b/src/main/java/tools/jackson/databind/introspect/MemberKey.java
@@ -17,12 +17,12 @@ public final class MemberKey
 
  public MemberKey(Method m)
  {
- this(m.getName(), m.getParameterTypes());
+ this(m.getName(), m.getParameterCount() > 0 ? m.getParameterTypes() : NO_CLASSES);
  }
 
  public MemberKey(Constructor<?> ctor)
  {
- this("", ctor.getParameterTypes());
+ this("", ctor.getParameterCount() > 0 ? ctor.getParameterTypes() : NO_CLASSES);
  }
 
  public MemberKey(String name, Class<?>[] argTypes)