From 36633418201d5dccdfde0353dcdb4ef822cec775 Mon Sep 17 00:00:00 2001
From: Nicola Isotta <nisotta@apache.org>
Date: Fri, 13 Nov 2026 14:37:14 +0100
Subject: [PATCH] Fix NPE in JPA RelationshipMappingRename

The plugin runs on every Java member rename. When the renamed variable's
handle can't be resolved, resolveElement() returns null; guard against it
as the second resolution block already does.
---
 .../j2ee/jpa/refactoring/rename/RelationshipMappingRename.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/rename/RelationshipMappingRename.java b/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/rename/RelationshipMappingRename.java
index 0b7f8cbeb183..8ce1186a1c5c 100644
--- a/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/rename/RelationshipMappingRename.java
+++ b/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/rename/RelationshipMappingRename.java
@@ -123,7 +123,7 @@ public void run(CompilationController ci) throws Exception {
                         ci.toPhase(JavaSource.Phase.ELEMENTS_RESOLVED);
                         Element resElement = handle.resolveElement(ci);
                         VariableElement var = (VariableElement) resElement;
-                        Element mainEntTmp = var.getEnclosingElement();
+                        Element mainEntTmp = var != null ? var.getEnclosingElement() : null;
                         TypeElement mainEnt = mainEntTmp instanceof TypeElement ? (TypeElement) mainEntTmp : null;
                         if (mainEnt == null) {
                             return;