[330067] CDO Repository view expanding repository connection results in exception

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

1 files changed, 14 insertions, 11 deletions

diff --git a/plugins/org.eclipse.emf.cdo.location/src/org/eclipse/emf/cdo/internal/location/BranchCheckoutSource.java b/plugins/org.eclipse.emf.cdo.location/src/org/eclipse/emf/cdo/internal/location/BranchCheckoutSource.java
index 4a05f0fdef..576722935a 100644
--- a/plugins/org.eclipse.emf.cdo.location/src/org/eclipse/emf/cdo/internal/location/BranchCheckoutSource.java
+++ b/plugins/org.eclipse.emf.cdo.location/src/org/eclipse/emf/cdo/internal/location/BranchCheckoutSource.java
@@ -66,22 +66,25 @@ public class BranchCheckoutSource extends Container<BranchCheckoutSource> implem
   {
     if (subBranches == null)
     {
+      subBranches = new ArrayList<BranchCheckoutSource>();
+
       CDOSessionConfiguration config = getRepositoryLocation().createSessionConfiguration();
       CDOSession session = config.openSession();
-
-      try
+      if (session.getRepositoryInfo().isSupportingBranches())
       {
-        CDOBranch branch = session.getBranchManager().getBranch(getBranchPath());
-        CDOBranch[] branches = branch.getBranches();
-        subBranches = new ArrayList<BranchCheckoutSource>();
-        for (CDOBranch subBranch : branches)
+        try
         {
-          subBranches.add(new BranchCheckoutSource(this, subBranch.getName()));
+          CDOBranch branch = session.getBranchManager().getBranch(getBranchPath());
+          CDOBranch[] branches = branch.getBranches();
+          for (CDOBranch subBranch : branches)
+          {
+            subBranches.add(new BranchCheckoutSource(this, subBranch.getName()));
+          }
+        }
+        finally
+        {
+          IOUtil.close(session);
         }
-      }
-      finally
-      {
-        IOUtil.close(session);
       }
     }