diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.access')
2 files changed, 24 insertions, 8 deletions
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java index c52fa2208d1..e0d1ea3b869 100644 --- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java +++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java @@ -147,16 +147,22 @@ public class AccessControlService implements IAccessControlService { public void start() { listener1 = new AccessControlUpdateListener(); - eventService.addListener(EventQosType.NORMAL, listener1); + if (eventService != null) { + eventService.addListener(EventQosType.NORMAL, listener1); + } } public void stop() { if (listener1 != null) { - eventService.removeListener(EventQosType.NORMAL, listener1); + if (eventService != null) { + eventService.removeListener(EventQosType.NORMAL, listener1); + } listener1 = null; } if (listener2 != null) { - eventService.removeListener(EventQosType.NORMAL, listener2); + if (eventService != null) { + eventService.removeListener(EventQosType.NORMAL, listener2); + } listener2 = null; } } @@ -351,7 +357,9 @@ public class AccessControlService implements IAccessControlService { if (listener2 == null) { listener2 = new AccessControlUpdateListener((Artifact) userArtifact.getFullArtifact()); - eventService.addListener(EventQosType.NORMAL, listener2); + if (eventService != null) { + eventService.addListener(EventQosType.NORMAL, listener2); + } } AccessData accessData = null; @@ -676,7 +684,9 @@ public class AccessControlService implements IAccessControlService { } } try { - eventService.send(this, event); + if (eventService != null) { + eventService.send(this, event); + } } catch (Exception ex) { OseeLog.log(AccessControlHelper.class, Level.SEVERE, ex); } @@ -700,7 +710,9 @@ public class AccessControlService implements IAccessControlService { } } try { - eventService.send(this, event); + if (eventService != null) { + eventService.send(this, event); + } } catch (Exception ex) { OseeLog.log(AccessControlHelper.class, Level.SEVERE, ex); } diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java index 381481c34af..0bfbdd8b925 100644 --- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java +++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java @@ -137,7 +137,9 @@ public final class AccessControlServiceProxy implements IAccessControlService { accessService = new AccessControlService(dbService, cachingService, eventService); accessEventListener = new AccessEventListener(accessService, new AccessControlCacheHandler()); - eventService.addListener(EventQosType.PRIORITY, accessEventListener); + if (eventService != null) { + eventService.addListener(EventQosType.PRIORITY, accessEventListener); + } accessService.start(); } @@ -153,7 +155,9 @@ public final class AccessControlServiceProxy implements IAccessControlService { registered.clear(); if (accessEventListener != null) { - eventService.removeListener(EventQosType.PRIORITY, accessEventListener); + if (eventService != null) { + eventService.removeListener(EventQosType.PRIORITY, accessEventListener); + } accessEventListener = null; } |