From 0e5515c8ae4c37e8b4ab7439f456eb97e387ef72 Mon Sep 17 00:00:00 2001 From: pfurio Date: Thu, 19 Sep 2024 14:56:03 +0200 Subject: [PATCH 1/2] server: avoid NPE when body of POST WS is null, #TASK-4073 --- .../server/rest/operations/VariantOperationWebService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/opencga-server/src/main/java/org/opencb/opencga/server/rest/operations/VariantOperationWebService.java b/opencga-server/src/main/java/org/opencb/opencga/server/rest/operations/VariantOperationWebService.java index 14fb051c85..4b9613b926 100644 --- a/opencga-server/src/main/java/org/opencb/opencga/server/rest/operations/VariantOperationWebService.java +++ b/opencga-server/src/main/java/org/opencb/opencga/server/rest/operations/VariantOperationWebService.java @@ -593,7 +593,12 @@ public Response submitOperationToProject(String toolId, String project, ToolPara public Response submitOperation(String toolId, String project, String study, ToolParams params, String jobName, String jobDescription, String jobDependsOn, String jobTags, String jobScheduledStartTime, String jobPriority, Boolean dryRun) { try { - Map paramsMap = params.toParams(); + Map paramsMap; + if (params != null) { + paramsMap = params.toParams(); + } else { + paramsMap = new HashMap<>(); + } if (StringUtils.isNotEmpty(study)) { paramsMap.put(ParamConstants.STUDY_PARAM, study); } From 9002818b3b035096e78a0b3da4da56dd55132301 Mon Sep 17 00:00:00 2001 From: pfurio Date: Thu, 19 Sep 2024 17:44:42 +0200 Subject: [PATCH 2/2] server: avoid npe for empty body in post calls, #TASK-4073 --- .../org/opencb/opencga/server/rest/OpenCGAWSServer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/opencga-server/src/main/java/org/opencb/opencga/server/rest/OpenCGAWSServer.java b/opencga-server/src/main/java/org/opencb/opencga/server/rest/OpenCGAWSServer.java index 3dae031c24..2df5a8d71f 100644 --- a/opencga-server/src/main/java/org/opencb/opencga/server/rest/OpenCGAWSServer.java +++ b/opencga-server/src/main/java/org/opencb/opencga/server/rest/OpenCGAWSServer.java @@ -882,7 +882,12 @@ protected DataResult submitJobRaw(String toolId, String project, String stu String jobDescription, String jobDependsOnStr, String jobTagsStr, String jobScheduledStartTime, String jobPriority, Boolean dryRun) throws CatalogException { - Map paramsMap = bodyParams.toParams(); + Map paramsMap; + if (bodyParams != null) { + paramsMap = bodyParams.toParams(); + } else { + paramsMap = new HashMap<>(); + } if (StringUtils.isNotEmpty(study)) { paramsMap.putIfAbsent(ParamConstants.STUDY_PARAM, study); }