Fix NPE in UndoManager2.addUndo fixes eclipse-platform#2004

TriggeredOperations.getTriggeringOperation() can return null after
TriggeredOperations.remove()

eclipse-platform#2004

Author: jukzi

bundles/org.eclipse.core.commands/src/org/eclipse/core/commands/operations/TriggeredOperations.java

@@ -295,10 +295,11 @@ private void removeAllChildren() {
 	}
 
 	/**
-	 * Return the operation that triggered the other operations in this
-	 * composite.
+	 * Return the operation that triggered the other operations in this composite.
 	 *
-	 * @return the IUndoableOperation that triggered the other children.
+	 * @return the IUndoableOperation that triggered the other children or
+	 *         <code>null</code> if the triggeringOperation was removed
+	 * @see TriggeredOperations#remove(IUndoableOperation)
 	 */
 	public IUndoableOperation getTriggeringOperation() {
 		return triggeringOperation;

bundles/org.eclipse.ltk.core.refactoring/src/org/eclipse/ltk/internal/core/refactoring/UndoManager2.java

@@ -173,9 +173,10 @@ public void changePerformed(Change change, boolean successful) {
 	@Override
 	public void addUndo(String name, Change change) {
 		if (fActiveOperation != null) {
-			UndoableOperation2ChangeAdapter operation= (UndoableOperation2ChangeAdapter)fActiveOperation.getTriggeringOperation();
-			operation.setUndoChange(change);
-			operation.setLabel(name);
+			if (fActiveOperation.getTriggeringOperation() instanceof UndoableOperation2ChangeAdapter operation) {
+				operation.setUndoChange(change);
+				operation.setLabel(name);
+			}
 			fOperationHistory.add(fActiveOperation);
 			fActiveOperation= null;
 		}