diff --git a/modules/dcache-qos/src/main/java/org/dcache/qos/services/adjuster/handlers/QoSAdjusterTaskHandler.java b/modules/dcache-qos/src/main/java/org/dcache/qos/services/adjuster/handlers/QoSAdjusterTaskHandler.java index 289a679eec5..766084621c8 100644 --- a/modules/dcache-qos/src/main/java/org/dcache/qos/services/adjuster/handlers/QoSAdjusterTaskHandler.java +++ b/modules/dcache-qos/src/main/java/org/dcache/qos/services/adjuster/handlers/QoSAdjusterTaskHandler.java @@ -106,10 +106,11 @@ public void handleAdjustmentCancelled(PnfsId pnfsId) { public void notifyAdjustmentCompleted(QoSAdjusterTask task) { QoSAdjustmentStatus status; + Throwable error = task.getException(); if (task.isCancelled()) { status = QoSAdjustmentStatus.CANCELLED; - } else if (task.getException() != null) { + } else if (error != null) { status = QoSAdjustmentStatus.FAILED; } else { status = QoSAdjustmentStatus.COMPLETED; @@ -117,8 +118,6 @@ public void notifyAdjustmentCompleted(QoSAdjusterTask task) { PnfsId pnfsId = task.getPnfsId(); QoSAction action = task.getAction(); - Throwable error = task.getException(); - QoSAdjustmentResponse response = new QoSAdjustmentResponse(); response.setAction(action); response.setPnfsId(pnfsId); diff --git a/modules/dcache-qos/src/main/java/org/dcache/qos/services/adjuster/util/QoSAdjusterTask.java b/modules/dcache-qos/src/main/java/org/dcache/qos/services/adjuster/util/QoSAdjusterTask.java index 9db5a55977b..0d68bd23d1b 100644 --- a/modules/dcache-qos/src/main/java/org/dcache/qos/services/adjuster/util/QoSAdjusterTask.java +++ b/modules/dcache-qos/src/main/java/org/dcache/qos/services/adjuster/util/QoSAdjusterTask.java @@ -136,8 +136,8 @@ public QoSAdjusterTask(QoSAdjusterTask task, int retry) { this.source = task.source; this.target = task.target; this.poolGroup = task.poolGroup; - this.status = task.status; this.subject = task.subject; + this.status = Status.INITIALIZED; } @Override