Fix #408: Retrieve Cache Proxy: does not update study.failed_retrieve…

…s, if no objects received from fallbackCMoveSCP are forwarded to the final Move Destination
dcm4che · Oct 6, 2016 · 043d5ab · 043d5ab
1 parent ccbfb06
commit 043d5ab
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/dcm4chee-arc-retrieve/src/main/java/org/dcm4chee/arc/retrieve/RetrieveContext.java b/dcm4chee-arc-retrieve/src/main/java/org/dcm4chee/arc/retrieve/RetrieveContext.java
@@ -191,8 +191,6 @@ public interface RetrieveContext extends Closeable {
 
  int remaining();
 
- int getNumberOfCStoreForwards();
-
  int status();
 
  String getOutcomeDescription();

diff --git a/dcm4chee-arc-retrieve/src/main/java/org/dcm4chee/arc/retrieve/impl/RetrieveContextImpl.java b/dcm4chee-arc-retrieve/src/main/java/org/dcm4chee/arc/retrieve/impl/RetrieveContextImpl.java
@@ -455,11 +455,6 @@ public int remaining() {
  - completed() - warning() - failed();
  }
 
- @Override
- public int getNumberOfCStoreForwards() {
- return cstoreForwards.size();
- }
-
  @Override
  public int status() {
  return (failed() == 0 && warning() == 0)

diff --git a/dcm4chee-arc-retrieve/src/main/java/org/dcm4chee/arc/retrieve/impl/RetrieveServiceImpl.java b/dcm4chee-arc-retrieve/src/main/java/org/dcm4chee/arc/retrieve/impl/RetrieveServiceImpl.java
@@ -526,8 +526,7 @@ private void waitForPendingCMoveForward(RetrieveContext ctx, Association fwdas)
 
  @Override
  public void updateFailedSOPInstanceUIDList(RetrieveContext ctx) {
- if (ctx.getNumberOfCStoreForwards() > 0)
- ejb.updateFailedSOPInstanceUIDList(ctx, failedIUIDList(ctx));
+ ejb.updateFailedSOPInstanceUIDList(ctx, failedIUIDList(ctx));
  }
 
  private String failedIUIDList(RetrieveContext ctx) {