|
@@ -51,17 +51,9 @@ public class CurrentTaskUtil {
|
|
* @param libraryId
|
|
* @param libraryId
|
|
*/
|
|
*/
|
|
public static void remove(Marker marker, int libraryId) {
|
|
public static void remove(Marker marker, int libraryId) {
|
|
- //TaskEntry obj = new TaskEntry(marker.getId(), libraryId);
|
|
|
|
|
|
+ TaskEntry obj = new TaskEntry(marker.getId(), libraryId);
|
|
synchronized (CurrentTaskUtil.class) {
|
|
synchronized (CurrentTaskUtil.class) {
|
|
- //taskMap.remove(getKey(marker.getExamId(), marker.getSubjectCode()), obj);
|
|
|
|
- Set<TaskEntry> set = taskMap.get(getKey(marker.getExamId(), marker.getSubjectCode()));
|
|
|
|
- if (set != null) {
|
|
|
|
- for (TaskEntry taskEntry : set) {
|
|
|
|
- if (taskEntry.markerId == marker.getId() && taskEntry.libraryId==libraryId) {
|
|
|
|
- taskMap.remove(getKey(marker.getExamId(), marker.getSubjectCode()),taskEntry);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ taskMap.remove(getKey(marker.getExamId(), marker.getSubjectCode()), obj);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|