[569723] [UI] Invalid attempt to open a transaction on a historical checkout

https://bugs.eclipse.org/bugs/show_bug.cgi?id=569723

3 files changed, 21 insertions, 17 deletions

diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.explorer.ui/META-INF/MANIFEST.MF
index 8e1bdd001d..35b78a79d0 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.explorer.ui;singleton:=true
-Bundle-Version: 4.7.0.qualifier
+Bundle-Version: 4.7.1.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.explorer.ui.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -24,16 +24,16 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.ui.shared;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.ui.compare;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
  org.eclipse.emf.cdo.ui.team;bundle-version="[4.0.0,5.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.explorer.ui;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.explorer.ui.actions;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.explorer.ui.application;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.explorer.ui.bundle;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.explorer.ui.checkouts;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.explorer.ui.checkouts.actions;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.explorer.ui.checkouts.wizards;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.explorer.ui.handlers;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.explorer.ui.properties;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.explorer.ui.repositories;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.explorer.ui.repositories.wizards;version="4.7.0";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.explorer.ui;version="4.7.1";x-internal:=true,
+ org.eclipse.emf.cdo.explorer.ui.actions;version="4.7.1";x-internal:=true,
+ org.eclipse.emf.cdo.explorer.ui.application;version="4.7.1";x-internal:=true,
+ org.eclipse.emf.cdo.explorer.ui.bundle;version="4.7.1";x-internal:=true,
+ org.eclipse.emf.cdo.explorer.ui.checkouts;version="4.7.1";x-internal:=true,
+ org.eclipse.emf.cdo.explorer.ui.checkouts.actions;version="4.7.1";x-internal:=true,
+ org.eclipse.emf.cdo.explorer.ui.checkouts.wizards;version="4.7.1";x-internal:=true,
+ org.eclipse.emf.cdo.explorer.ui.handlers;version="4.7.1";x-internal:=true,
+ org.eclipse.emf.cdo.explorer.ui.properties;version="4.7.1";x-internal:=true,
+ org.eclipse.emf.cdo.explorer.ui.repositories;version="4.7.1";x-internal:=true,
+ org.eclipse.emf.cdo.explorer.ui.repositories.wizards;version="4.7.1";x-internal:=true
 Eclipse-BuddyPolicy: registered
 Automatic-Module-Name: org.eclipse.emf.cdo.explorer.ui
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/pom.xml b/plugins/org.eclipse.emf.cdo.explorer.ui/pom.xml
index f595dfb678..7cf541f0e1 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.explorer.ui</artifactId>
-  <version>4.7.0-SNAPSHOT</version>
+  <version>4.7.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/OpenWithActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/OpenWithActionProvider.java
index 0b81a63a53..18d682bdf1 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/OpenWithActionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/OpenWithActionProvider.java
@@ -307,14 +307,14 @@ public class OpenWithActionProvider extends CommonActionProvider
       {
         CDOView view = resourceLeaf.cdoView();
         CDOCheckout checkout = CDOExplorerUtil.getCheckout(view);
-        CDOTransaction transaction = checkout != null ? checkout.openTransaction() : view.getSession().openTransaction(view.getBranch());
-        CDOResourceLeaf txLeaf = transaction.getObject(resourceLeaf);
+        CDOTransaction tx = view.isHistorical() ? null : checkout != null ? checkout.openTransaction() : view.getSession().openTransaction(view.getBranch());
+        CDOResourceLeaf txLeaf = tx == null ? resourceLeaf : tx.getObject(resourceLeaf);
 
         try
         {
           CDOLobEditorInput editorInput = (CDOLobEditorInput)CDOEditorUtil.createLobEditorInput(txLeaf, true);
 
-          if (!OMIT_LOB_HANDLER_URI)
+          if (checkout != null && !OMIT_LOB_HANDLER_URI)
           {
             editorInput.setURI(CDOExplorerURIHandler.createURI(checkout, txLeaf));
           }
@@ -328,7 +328,11 @@ public class OpenWithActionProvider extends CommonActionProvider
             {
               if (part == editor)
               {
-                transaction.close();
+                if (tx != null)
+                {
+                  tx.close();
+                }
+
                 editor.getSite().getPage().removePartListener(this);
               }
             }