From 38c9eeed8e8a936e535c2d13fc6d7ed4dd15dfb5 Mon Sep 17 00:00:00 2001
From: Brad Gonzales <bradley_l_gonzales@raytheon.com>
Date: Wed, 16 Oct 2013 17:03:04 -0500
Subject: [PATCH] Issue #2267 Reverted HibernateBandwidthInitializer to check
 for local only.

Change-Id: If51cad02663bf584f90588c8586c2215340fc1e4

Former-commit-id: eb7a1ebf6273a800295a68c76bc30b1629fbaeb3 [formerly a86b767af49c9e2c9f67d7d19a9691883feea7ea [formerly 1b9ac343acea0eb70cada015e6af257058217f36]]
Former-commit-id: a86b767af49c9e2c9f67d7d19a9691883feea7ea
Former-commit-id: d943481576771875a93dec848a4b580d1222bb88
---
 .../hibernate/HibernateBandwidthInitializer.java    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthInitializer.java b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthInitializer.java
index f5759ec116..c10a8e15a5 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthInitializer.java
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthInitializer.java
@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Set;
 
 import com.raytheon.edex.site.SiteUtil;
-import com.raytheon.uf.common.datadelivery.registry.SharedSubscription;
 import com.raytheon.uf.common.datadelivery.registry.Subscription;
 import com.raytheon.uf.common.registry.ebxml.RegistryUtil;
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -34,7 +33,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.retrieval.RetrievalManager;
  * Jun 25, 2013 2106       djohnson     init() now takes a {@link RetrievalManager} as well.
  * Sep 05, 2013 2330       bgonzale     On WFO registry init, only subscribe to local site subscriptions.
  * Sep 06, 2013 2344       bgonzale     Removed attempt to add to immutable empty set.
- * Oct 07, 2013 2267       bgonzale     in executeAfterRegistryInit NCF schedules shared subs.
+ * Oct 16, 2013 2267       bgonzale     executeAfterRegistryInit subscribes to all local.  Removed is shared checks.
  * 
  * </pre>
  * 
@@ -88,22 +87,20 @@ public class HibernateBandwidthInitializer implements BandwidthInitializer {
         Set<Subscription> activeSubscriptions = new HashSet<Subscription>();
         try {
             final String localOffice = SiteUtil.getSite();
-            final boolean isCentralRegistry = System.getProperty(
-                    "edex.run.mode").equals("centralRegistry");
 
             // Load active subscriptions
             for (Subscription sub : findSubscriptionsStrategy
                     .findSubscriptionsToSchedule()) {
-                boolean isShared = (sub instanceof SharedSubscription);
                 boolean isLocalOffice = sub.getOfficeIDs()
                         .contains(localOffice);
 
-                if ((isCentralRegistry && isShared)
-                        || (!isShared && isLocalOffice)) {
+                if (isLocalOffice) {
                     activeSubscriptions.add(sub);
                     statusHandler.info("Scheduling Subscription: " + sub);
                 } else {
-                    statusHandler.info("Not Scheduling Subscription: " + sub);
+                    statusHandler
+                            .info("Not Scheduling Non-local Subscription: "
+                                    + sub);
                 }
             }
         } catch (Exception e) {