[163346] gmf_R1_0_maintenance ahunter 070109 NPE in DiagramDocumentEditorMatchingStrategy
diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/META-INF/MANIFEST.MF
index ea4dfc5..e9070d8 100644
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui.resources.editor; singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.3.qualifier
Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/parts/DiagramDocumentEditorMatchingStrategy.java b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/parts/DiagramDocumentEditorMatchingStrategy.java
index 1c901af..2162083 100644
--- a/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/parts/DiagramDocumentEditorMatchingStrategy.java
+++ b/org.eclipse.gmf.runtime.diagram.ui.resources.editor/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/parts/DiagramDocumentEditorMatchingStrategy.java
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -69,7 +69,7 @@
IEditorInput editorInput = docProvider
.createInputWithEditingDomain(input,
((DiagramDocumentEditor) editor).getEditingDomain());
- return editorInput.equals(existingEditorInput);
+ return existingEditorInput.equals(editorInput);
}
}
return false;