From 3d91127f916dcc7d6c6d51805765db56e42be2fe Mon Sep 17 00:00:00 2001
From: donald.g.dunne
Date: Tue, 30 Oct 2012 08:09:22 -0700
Subject: refinement: Improve AccessControlCacheHandler to support deleted
 branches

---
 .../osee/framework/access/internal/AccessControlCacheHandler.java  | 5 +++--
 .../osee/framework/access/internal/data/BranchAccessObject.java    | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'plugins/org.eclipse.osee.framework.access')

diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlCacheHandler.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlCacheHandler.java
index 178c3f354a6..039a4edfd32 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlCacheHandler.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlCacheHandler.java
@@ -11,7 +11,6 @@
 package org.eclipse.osee.framework.access.internal;
 
 import java.util.List;
-
 import org.eclipse.osee.framework.access.AccessControlData;
 import org.eclipse.osee.framework.access.AccessObject;
 import org.eclipse.osee.framework.access.internal.data.BranchAccessObject;
@@ -24,7 +23,9 @@ public class AccessControlCacheHandler {
 
    public void updateAccessListForBranchObject(AccessControlService service, final String branchGuid) throws OseeCoreException {
       BranchAccessObject branchAccessObject = BranchAccessObject.getBranchAccessObject(branchGuid);
-      updateAccessList(service, branchAccessObject);
+      if (branchAccessObject != null) {
+         updateAccessList(service, branchAccessObject);
+      }
    }
 
    public void updateAccessList(AccessControlService service, AccessObject accessObject) throws OseeCoreException {
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java
index d4335e5c2c7..569173afc6a 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java
@@ -15,6 +15,7 @@ import java.util.Map;
 import org.eclipse.osee.framework.access.AccessObject;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.database.core.ConnectionHandler;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
 
@@ -57,7 +58,11 @@ public class BranchAccessObject extends AccessObject {
    }
 
    public static BranchAccessObject getBranchAccessObject(String branchGuid) throws OseeCoreException {
-      return getBranchAccessObject(BranchManager.getBranchByGuid(branchGuid));
+      if (BranchManager.branchExists(branchGuid)) {
+         Branch branch = BranchManager.getBranchByGuid(branchGuid);
+         return getBranchAccessObject(branch);
+      }
+      return null;
    }
 
    public static BranchAccessObject getBranchAccessObject(int branchId) {
-- 
cgit v1.2.3