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

Merge "Issue #2034 Clear all locks in resource catalog before runAsync." into development

Browse source 
Former-commit-id: 62252d23a8 [formerly 6b78ebc2ad [formerly 076cf33079] [formerly 62252d23a8 [formerly d652b618cf6f93bb615572be1113390079a0902e]]]
Former-commit-id: 6b78ebc2ad [formerly 076cf33079]
Former-commit-id: 6b78ebc2ad
Former-commit-id: d65bd141d1
This commit is contained in:
Nate Jensen 2013-06-10 10:57:33 -05:00 • committed by Gerrit Code Review
commit 85bf71af87
1 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/ResourceCatalog.java
View file

@ -45,8 +45,10 @@ import com.raytheon.uf.viz.core.rsc.updater.DataUpdateTree;
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 7/1/06 chammack Initial Creation.
* ------------ ---------- ----------- --------------------------
* Jul 01, 2006 chammack Initial Creation.
* Jun 07, 2013 2034 bsteffen Clear all locks in resource catalog
* before runAsync.
*
* </pre>
*
@ -127,28 +129,34 @@ public class ResourceCatalog implements IDisposeListener {
* @param displayID
* the id of the display
*/
public synchronized void removeResource(
public void removeResource(
final AbstractVizResource<?, ?> resource, String displayID) {
Set<String> list = theMapping.get(resource);
if (list != null) {
list.remove(displayID);
if (list.size() == 0) {
// Only dispose of resources if they have been initialized
if (resource.getStatus() == ResourceStatus.INITIALIZED) {
// this needs to be async, otherwise other components like
// gfe can deadlock when this blocks but the UI thread is
// blocked waiting on a different lock
VizApp.runAsync(new Runnable() {
@Override
public void run() {
resource.dispose();
}
});
} else {
disposed(resource);
boolean dispose = false;
synchronized (this) {
Set<String> list = theMapping.get(resource);
if (list != null) {
list.remove(displayID);
if (list.size() == 0) {
// Only dispose of resources if they have been initialized
if (resource.getStatus() == ResourceStatus.INITIALIZED) {
dispose = true;
} else {
disposed(resource);
}
}
}
}
if (dispose) {
// this needs to be async outside the synchronized block, otherwise
// other components like gfe and warngen can deadlock when this
// blocks but the UI thread is blocked waiting on a different lock
VizApp.runAsync(new Runnable() {
@Override
public void run() {
resource.dispose();
}
});
}
}
/*
@ -162,7 +170,9 @@ public class ResourceCatalog implements IDisposeListener {
public void disposed(AbstractVizResource<?, ?> resource) {
// Nothing points to this resource
// remove it from the map, and invoke dispose.
theMapping.remove(resource);
synchronized (this) {
theMapping.remove(resource);
}
if (resource instanceof IResourceGroup) {
((IResourceGroup) resource).getResourceList().clear();