From ef625c321957831840476cc58a6f5bfda701fbe6 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Tue, 28 Jul 2026 20:13:28 +0200 Subject: [PATCH] Guard the preference store again in openCompareEditor The unified diff check dereferenced the compare configuration's preference store before the null guard that follows it, so every compare editor open threw a NullPointerException for a configuration without a preference store. Move the check inside the existing guard. --- .../org/eclipse/compare/internal/CompareUIPlugin.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java index f380ca3d85f..a75313fe8e4 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java @@ -574,11 +574,11 @@ public void openCompareEditor(final CompareEditorInput input, CompareConfiguration configuration = input.getCompareConfiguration(); if (configuration != null) { IPreferenceStore ps= configuration.getPreferenceStore(); - boolean unifiedDiffEnabled = ps.getBoolean(ComparePreferencePage.UNIFIED_DIFF); - if (unifiedDiffEnabled && openUnifiedDiffInEditor(input, page, editor, activate)) { - return; - } if (ps != null) { + if (ps.getBoolean(ComparePreferencePage.UNIFIED_DIFF) + && openUnifiedDiffInEditor(input, page, editor, activate)) { + return; + } configuration.setProperty( CompareConfiguration.USE_OUTLINE_VIEW, Boolean.valueOf(ps.getBoolean(ComparePreferencePage.USE_OUTLINE_VIEW)));