From 96c4beda19d8c58a8aab451ca4ede06ee4e071d8 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Wed, 28 May 2025 16:41:05 -0400 Subject: [PATCH] Fix NPE when viewer control doesn't adapt to CompareConfiguration Follow up to https://github.com/eclipse-platform/eclipse.platform.ui/pull/2629 which introduced an NPE when doing refactor->rename in CDT: https://github.com/eclipse-cdt/cdt/issues/1172 --- .../ltk/internal/ui/refactoring/PreviewWizardPage.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java b/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java index 95c263e4332..6d086c801b2 100644 --- a/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java +++ b/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java @@ -673,7 +673,9 @@ private void showPreview(PreviewNode element) { if (container != null) { if (newViewer.getControl() instanceof IAdaptable adaptable) { CompareConfiguration config = adaptable.getAdapter(CompareConfiguration.class); - config.setContainer(new WizardCompareContainer(container)); + if (config != null) { + config.setContainer(new WizardCompareContainer(container)); + } } } } else {