Tools/SCViewer
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes database reopening problem due to locking

Browse Source
This commit is contained in:
Eyck Jentzsch
2023-03-01 12:53:34 +01:00
parent f64a1baf02
commit 6769513e2d
9 changed files with 83 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDb.java
View File

@ -62,4 +62,13 @@ public interface IWaveformDb extends IHierNode {
*/
public boolean isLoaded();
/**
* close an open database.
*
* @param inp the inp
* @return true, if successful
*/
public void close();
}

9
plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java
View File

@ -18,6 +18,7 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
@ -39,6 +40,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
/** The loaders. */
private static List<IWaveformDbLoaderFactory> loaderFactories = new LinkedList<>();
private List<IWaveformDbLoader> activeLoader = new ArrayList<>();
/** The loaded. */
private boolean loaded;
@ -136,6 +138,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
loader.addPropertyChangeListener(this);
try {
loader.load(inp);
activeLoader.add(loader);
} catch (Exception e) {
LOG.error("error loading file "+inp.getName(), e);
retval=false;
@ -158,6 +161,12 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
return retval;
}
@Override
public void close() {
for (IWaveformDbLoader entry : activeLoader) {
entry.dispose();
}
}
/**
* Gets the file basename.
*