Merge remote-tracking branch 'refs/remotes/origin/support-4.3' into s…

…upport-4.3
Evolveum · Sep 23, 2021 · 4893857 · 4893857
2 parents 003bda8 + 9fa4c67
commit 4893857
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java b/model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
@@ -474,16 +474,16 @@ public InputStream getReportDataStream(String reportDataOid, OperationResult par
                     return null;
                 }
                 Holder<InputStream> inputStreamHolder = new Holder<>();
-                String originalNodeId = reportOutput.getNodeRef() != null ? reportOutput.getNodeRef().getOid() : null;
-                PrismObject<NodeType> executorNode = clusterExecutionHelper.executeWithFallback(originalNodeId,
+                @Nullable String originalNodeOid = reportOutput.getNodeRef() != null ? reportOutput.getNodeRef().getOid() : null;
+                PrismObject<NodeType> executorNode = clusterExecutionHelper.executeWithFallback(originalNodeOid,
                         (client, node, result1) -> {
                             client.path(ModelPublicConstants.CLUSTER_REPORT_FILE_PATH);
                             client.query(ModelPublicConstants.CLUSTER_REPORT_FILE_FILENAME_PARAMETER, fileName);
                             client.accept(MediaType.APPLICATION_OCTET_STREAM);
                             Response response = client.get();
                             Response.StatusType statusInfo = response.getStatusInfo();
                             LOGGER.debug("Retrieving report output file ({}) from {} finished with status {}: {}",
-                                    fileName, reportOutput.getNodeRef().getOid(), statusInfo.getStatusCode(), statusInfo.getReasonPhrase());
+                                    fileName, originalNodeOid, statusInfo.getStatusCode(), statusInfo.getReasonPhrase());
                             if (statusInfo.getFamily() == Response.Status.Family.SUCCESSFUL) {
                                 Object entity = response.getEntity();
                                 if (entity == null || entity instanceof InputStream) {
@@ -496,13 +496,13 @@ public InputStream getReportDataStream(String reportDataOid, OperationResult par
                                 }
                             } else {
                                 LOGGER.warn("Retrieving report output file ({}) from {} finished with status {}: {}",
-                                        fileName, reportOutput.getNodeRef().getOid(), statusInfo.getStatusCode(), statusInfo.getReasonPhrase());
+                                        fileName, originalNodeOid, statusInfo.getStatusCode(), statusInfo.getReasonPhrase());
                                 result1.recordFatalError("Could not retrieve report output file: Got " + statusInfo.getStatusCode() + ": " + statusInfo.getReasonPhrase());
                                 response.close();
                             }
                         }, new ClusterExecutionOptions().tryNodesInTransition().skipDefaultAccept(), "get report output", result);
 
-                if (executorNode != null && !executorNode.getOid().equals(originalNodeId)) {
+                if (executorNode != null && !executorNode.getOid().equals(originalNodeOid)) {
                     LOGGER.info("Recording new location of {}: {}", reportOutput, executorNode);
                     List<ItemDelta<?, ?>> deltas = prismContext.deltaFor(ReportDataType.class)
                             .item(ReportDataType.F_NODE_REF).replace(createObjectRef(executorNode, prismContext))