Prevent potential NPE in PomEdits.performOnDOMDocument
Change-Id: Id3115cccb83762c59b825f19203f76158b173f30
Signed-off-by: Fred Bricon <fbricon@gmail.com>
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/PomEdits.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/PomEdits.java
index cebd7e4..56d3e15 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/PomEdits.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/editing/PomEdits.java
@@ -508,17 +508,21 @@
}
}
- try {
- tuple.getOperation().process(domModel.getDocument());
- } finally {
- if(!tuple.isReadOnly()) {
- undo.endRecording(domModel);
- if(session != null && domModel.getStructuredDocument() instanceof IDocumentExtension4) {
- IDocumentExtension4 ext4 = (IDocumentExtension4) domModel.getStructuredDocument();
- ext4.stopRewriteSession(session);
+ if(domModel != null) {
+ try {
+ tuple.getOperation().process(domModel.getDocument());
+ } finally {
+ if(!tuple.isReadOnly()) {
+ undo.endRecording(domModel);
+ if(session != null && domModel.getStructuredDocument() instanceof IDocumentExtension4) {
+ IDocumentExtension4 ext4 = (IDocumentExtension4) domModel.getStructuredDocument();
+ ext4.stopRewriteSession(session);
+ }
+ domModel.changedModel();
}
- domModel.changedModel();
}
+ } else {
+ System.err.println("domModel was null!!!");
}
} finally {
if(domModel != null) {
