master: Fix conflicts. #TASK-6219

opencb · Oct 16, 2024 · a028b40 · a028b40
1 parent 646e7ac
commit a028b40
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/opencga-core/src/main/java/org/opencb/opencga/core/models/variant/OperationIndexStatus.java b/opencga-core/src/main/java/org/opencb/opencga/core/models/variant/OperationIndexStatus.java
@@ -14,7 +14,7 @@ public class OperationIndexStatus extends IndexStatus {
 
     public OperationIndexStatus(String status, String message) {
         if (isValid(status)) {
-            init(status, status, message);
+            init(status, message);
         } else {
             throw new IllegalArgumentException("Unknown status " + status);
         }

diff --git a/...a-master/src/main/java/org/opencb/opencga/master/monitor/daemons/MonitorParentDaemon.java b/...a-master/src/main/java/org/opencb/opencga/master/monitor/daemons/MonitorParentDaemon.java
@@ -90,4 +90,8 @@ public void init() throws Exception {
     }
 
     public abstract void apply() throws Exception;
+
+    @Override
+    public void close() throws IOException {
+    }
 }
diff --git a/...ster/src/main/java/org/opencb/opencga/master/monitor/daemons/VariantOperationJanitor.java b/...ster/src/main/java/org/opencb/opencga/master/monitor/daemons/VariantOperationJanitor.java
@@ -170,7 +170,7 @@ private void checkPendingChore(OperationChore operationChore, Project project) t
             paramsMap.put(ParamConstants.PROJECT_PARAM, project.getFqn());
             catalogManager.getJobManager().submit(studyFqns.get(0), toolId, Enums.Priority.HIGH, paramsMap, null,
                     generateJobDescription(config, operationChore, attributes), null,
-                    Collections.singletonList(TAG), attributes, token);
+                    Collections.singletonList(TAG), null, null, null, attributes, token);
         }
     }
 
@@ -206,7 +206,7 @@ private void checkPendingChore(OperationChore operationChore, Project project, S
             paramsMap.put(ParamConstants.STUDY_PARAM, study.getFqn());
             catalogManager.getJobManager().submit(study.getFqn(), toolId, Enums.Priority.HIGH, paramsMap, null,
                     generateJobDescription(config, operationChore, attributes), null,
-                    Collections.singletonList(TAG), attributes, token);
+                    Collections.singletonList(TAG), null, null, null, attributes, token);
         }
     }