diff --git a/harvester/harvester-core/src/main/java/dk/netarkivet/harvester/webinterface/servlet/Heritrix3JobMonitorThread.java b/harvester/harvester-core/src/main/java/dk/netarkivet/harvester/webinterface/servlet/Heritrix3JobMonitorThread.java index e20e09486f..5a9888597f 100644 --- a/harvester/harvester-core/src/main/java/dk/netarkivet/harvester/webinterface/servlet/Heritrix3JobMonitorThread.java +++ b/harvester/harvester-core/src/main/java/dk/netarkivet/harvester/webinterface/servlet/Heritrix3JobMonitorThread.java @@ -63,8 +63,6 @@ public class Heritrix3JobMonitorThread implements Runnable { /** A map from harvest job number to the running H3 job monitor for the given job */ public Map runningJobMonitorMap = new TreeMap(); - private final Object runningJobMonitorMapSynchronizer = new Object(); - public Map filterJobMonitorMap = new TreeMap(); public final Set h3HostPortSet = new HashSet(); @@ -125,7 +123,7 @@ public boolean accept(File dir, String name) { Heritrix3JobMonitor jobmonitor; Iterator jobidIter = runningJobs.iterator(); - synchronized (runningJobMonitorMapSynchronizer) { + synchronized (this) { filterJobMonitorMap.clear(); // For all running jobs.. @@ -229,7 +227,7 @@ public Set getRunningJobs() { public Heritrix3JobMonitor getRunningH3Job(long jobId) { Heritrix3JobMonitor h3Job; - synchronized (runningJobMonitorMapSynchronizer) { + synchronized (this) { h3Job = runningJobMonitorMap.get(jobId); } return h3Job; @@ -237,7 +235,7 @@ public Heritrix3JobMonitor getRunningH3Job(long jobId) { public List getRunningH3Jobs() { List h3JobsList = new LinkedList(); - synchronized (runningJobMonitorMapSynchronizer) { + synchronized (this) { h3JobsList.addAll(runningJobMonitorMap.values()); } return h3JobsList;