Pull request overview

Prevents a NullPointerException when addFinalizer is executed through the conflict-retry patch path and the primary resource is deleted between retries (i.e., the re-read get() returns null). This makes addFinalizer behave consistently with existing removeFinalizer handling in ResourceOperations.

Changes:

• Add a null-guard to the addFinalizer precondition in ResourceOperations to avoid dereferencing a deleted resource during retry.
• Add the same null-guard to the deprecated PrimaryUpdateAndCacheUtils.addFinalizer retry precondition (and log when the resource is gone).

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ResourceOperations.java:1094

• addFinalizer can now return null when the resource is deleted mid-retry (because the retry loop re-fetches with .get() which may return null, and the precondition returns false in that case). The Javadoc currently says it returns the updated resource, which no longer fully describes the behavior; please document the possible null return so callers know they must handle it.

        r -> {
          if (r == null) {
            log.warn("Cannot add finalizer since resource no longer exists.");
            return false;
          }
          return !r.hasFinalizer(finalizerName);
        },

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/PrimaryUpdateAndCacheUtils.java:298

• addFinalizer can now return null when the resource is deleted mid-retry (the retry loop re-fetches with .get() which may return null, and the precondition returns false). The Javadoc currently states it returns the updated resource, which is no longer complete; please document the possible null return value for callers.

        r -> {
          if (r == null) {
            log.warn("Cannot add finalizer since resource no longer exists.");
            return false;
          }
          return !r.hasFinalizer(finalizerName);
        });

LGTM