From 7f246a05dcbf11a6c9dcd21215f38f62ad801866 Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Wed, 4 Dec 2024 11:19:39 +0100
Subject: Fix potential NPE in ResolveMerger#getAttributesContentMergeStrategy

Change-Id: I2a4c57438c16a0c5bc1af4c7772eaf65049911e2
---
 org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'org.eclipse.jgit/src/org/eclipse/jgit/merge')

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index a6a287bcf4..a50a6440b9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -1507,9 +1507,12 @@ public class ResolveMerger extends ThreeWayMerger {
 	private ContentMergeStrategy getAttributesContentMergeStrategy(
 			Attributes attributes, ContentMergeStrategy strategy) {
 		Attribute attr = attributes.get(Constants.ATTR_MERGE);
-		if (attr != null && attr.getValue()
-				.equals(Constants.ATTR_BUILTIN_UNION_MERGE_DRIVER)) {
-			return ContentMergeStrategy.UNION;
+		if (attr != null) {
+			String attrValue = attr.getValue();
+			if (attrValue != null && attrValue
+					.equals(Constants.ATTR_BUILTIN_UNION_MERGE_DRIVER)) {
+				return ContentMergeStrategy.UNION;
+			}
 		}
 		return strategy;
 	}
-- 
cgit v1.2.3