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

Merge "Issue #2154 Ensure all resource groups get removed from the time matcher." into development

Browse source 
Former-commit-id: 817b4b80da [formerly 84ccd3140d] [formerly 1287301152] [formerly 817b4b80da [formerly 84ccd3140d] [formerly 1287301152] [formerly 6bb28cddcf [formerly 1287301152 [formerly 11ee25f7b9eb2f041e75e5922c9ebe95c1e64bab]]]]
Former-commit-id: 6bb28cddcf
Former-commit-id: 6cd7b2c546 [formerly ed0df5c004] [formerly 81c4a8a651ae50c86d9f296b775b9ee67245a9b7 [formerly 5ced5e04ff]]
Former-commit-id: 3f53748fde1740a45b5e198155cb454f33d7cdfb [formerly a42c398300]
Former-commit-id: 6f4d06acfe
This commit is contained in:
Nate Jensen 2013-07-08 13:33:30 -05:00 • committed by Gerrit Code Review
commit 943f34244b
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
View file

@ -77,7 +77,10 @@ import com.raytheon.uf.viz.core.time.TimeMatchingJob;
* ------------ ---------- ----------- --------------------------
* Aug 15, 2007 chammack Initial Creation.
* Nov 30, 2007 461 bphillip Using VizTime now for time matching
* Oct 22, 2009 #3348 bsteffen added ability to limit number of frames
* Oct 22, 2009 3348 bsteffen added ability to limit number of
* frames
* Jul 03, 2013 2154 bsteffen Ensure all resource groups get
* removed from the time matcher.
* </pre>
*
* @author chammack
@ -249,9 +252,15 @@ public abstract class AbstractDescriptor extends ResourceGroup implements
synchronized (timeManager) {
timeMatchingMap.remove(resource);
}
if (resource.getResourceData() instanceof IResourceGroup) {
ResourceList rl = ((IResourceGroup) resource.getResourceData())
ResourceList rl = null;
if (resource instanceof IResourceGroup) {
rl = ((IResourceGroup) resource)
.getResourceList();
} else if (resource.getResourceData() instanceof IResourceGroup) {
rl = ((IResourceGroup) resource.getResourceData())
.getResourceList();
}
if (rl != null) {
synchronized (rl) {
for (ResourcePair rp : rl) {
AbstractVizResource<?, ?> rsc = rp.getResource();