diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java index 44306e60d5..b20df287aa 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java @@ -688,7 +688,11 @@ public class StatusMerger { target.setFreeHeapBytes(target.getFreeHeapBytes() + toMerge.getFreeHeapBytes()); target.setFreeNonHeapBytes(target.getFreeNonHeapBytes() + toMerge.getFreeNonHeapBytes()); target.setMaxHeapBytes(target.getMaxHeapBytes() + toMerge.getMaxHeapBytes()); - target.setMaxNonHeapBytes(target.getMaxNonHeapBytes() + toMerge.getMaxNonHeapBytes()); + if (target.getMaxNonHeapBytes() != -1 && toMerge.getMaxNonHeapBytes() != -1) { + target.setMaxNonHeapBytes(target.getMaxNonHeapBytes() + toMerge.getMaxNonHeapBytes()); + } else { + target.setMaxNonHeapBytes(-1L); + } double systemLoad = target.getProcessorLoadAverage(); double toMergeSystemLoad = toMerge.getProcessorLoadAverage(); if (systemLoad >= 0 && toMergeSystemLoad >= 0) {