xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2613 Replication subscription start time correctly set" into omaha_14.2.1

Browse source 
Former-commit-id: 8b18800b95 [formerly 35299e917d] [formerly 8b18800b95 [formerly 35299e917d] [formerly 624c51e393 [formerly b21de50d989fa341b99c0632e908c6c1f7b6853f]]]
Former-commit-id: 624c51e393
Former-commit-id: d0ef49d66c [formerly c05162ed1a]
Former-commit-id: 7125f2eca0
This commit is contained in:
Richard Peter 2013-12-13 16:09:13 -06:00 • committed by Gerrit Code Review
commit 27716cb2fe
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
View file

@ -267,7 +267,7 @@ public class RegistryFederationManager implements RegistryInitializedListener {
*/ */
private static AtomicBoolean initialized = new AtomicBoolean(false); private static AtomicBoolean initialized = new AtomicBoolean(false);
private Long syncTime = 0l; private Long subscriptionStartTime = 0l;
/** /**
* Creates a new RegistryFederationManager * Creates a new RegistryFederationManager
@ -685,8 +685,9 @@ public class RegistryFederationManager implements RegistryInitializedListener {
sub.setOwner(federationProperties.getSiteIdentifier()); sub.setOwner(federationProperties.getSiteIdentifier());
sub.setStatus(StatusTypes.APPROVED); sub.setStatus(StatusTypes.APPROVED);
sub.setStartTime(EbxmlObjectUtil.getTimeAsXMLGregorianCalendar(syncTime sub.setStartTime(EbxmlObjectUtil
.longValue())); .getTimeAsXMLGregorianCalendar(subscriptionStartTime
.longValue()));
QueryType selectorQuery = new QueryType(); QueryType selectorQuery = new QueryType();
selectorQuery.setQueryDefinition(CanonicalQueryTypes.ADHOC_QUERY); selectorQuery.setQueryDefinition(CanonicalQueryTypes.ADHOC_QUERY);
@ -824,6 +825,9 @@ public class RegistryFederationManager implements RegistryInitializedListener {
} }
} }
} }
} else {
subscriptionStartTime = federatedRegistryMonitor
.getLastKnownUptime();
} }
statusHandler.info("Starting federated uptime monitor..."); statusHandler.info("Starting federated uptime monitor...");
scheduler.scheduleAtFixedRate(federatedRegistryMonitor, 0, 1, scheduler.scheduleAtFixedRate(federatedRegistryMonitor, 0, 1,
@ -842,7 +846,7 @@ public class RegistryFederationManager implements RegistryInitializedListener {
public void synchronizeRegistryWithFederation(final String remoteRegistryUrl) public void synchronizeRegistryWithFederation(final String remoteRegistryUrl)
throws EbxmlRegistryException, MsgRegistryException { throws EbxmlRegistryException, MsgRegistryException {
long start = TimeUtil.currentTimeMillis(); long start = TimeUtil.currentTimeMillis();
syncTime = start; subscriptionStartTime = start;
ExecutorService executor = Executors ExecutorService executor = Executors
.newFixedThreadPool(this.registrySyncThreads); .newFixedThreadPool(this.registrySyncThreads);