Revert "set ReadContext.size to expected stream length in ReadContext…

… passed to Storage.openInputStream(ReadContext ctx) and decrement it on read from returned InputStream" This reverts commit d9fa23f.
mingdatacom · Oct 13, 2015 · 531d254 · 531d254
1 parent d9fa23f
commit 531d254
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
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
@@ -332,7 +332,6 @@ private LocationDicomInputStream openLocationInputStream(
         Storage storage = getStorage(ctx, location.getStorageID());
         ReadContext readContext = storage.createReadContext();
         readContext.setStoragePath(location.getStoragePath());
-        readContext.setSize(location.getSize());
         readContext.setStudyInstanceUID(studyInstanceUID);
         InputStream stream = storage.openInputStream(readContext);
         try {

diff --git a/dcm4chee-arc-stgcmt-scp/src/main/java/org/dcm4chee/arc/stgcmt/scp/impl/StgCmtMDB.java b/dcm4chee-arc-stgcmt-scp/src/main/java/org/dcm4chee/arc/stgcmt/scp/impl/StgCmtMDB.java
@@ -60,7 +60,6 @@ public class StgCmtMDB implements MessageListener {
             QLocation.location.storageID,
             QLocation.location.storagePath,
             QLocation.location.digest,
-            QLocation.location.size,
             QLocation.location.status,
             QInstance.instance.sopClassUID,
             QInstance.instance.sopInstanceUID,
@@ -195,7 +194,6 @@ private boolean validateLocation(Tuple tuple, HashMap<String, Storage> storageMa
         Storage storage = getStorage(storageMap, tuple.get(QLocation.location.storageID));
         ReadContext readContext = storage.createReadContext();
         readContext.setStoragePath(tuple.get(QLocation.location.storagePath));
-        readContext.setSize(tuple.get(QLocation.location.size));
         readContext.setStudyInstanceUID(tuple.get(QStudy.study.studyInstanceUID));
         readContext.setMessageDigest(storage.getStorageDescriptor().getMessageDigest());
         try {

diff --git a/dcm4chee-arc-storage/src/main/java/org/dcm4chee/arc/storage/AbstractStorage.java b/dcm4chee-arc-storage/src/main/java/org/dcm4chee/arc/storage/AbstractStorage.java
@@ -137,22 +137,22 @@ public InputStream openInputStream(final ReadContext ctx) throws IOException {
             public int read() throws IOException {
                 int read = in.read();
                 if (read >= 0)
-                    ctx.incrementSize(-1);
+                    ctx.incrementSize(1);
                 return read;
             }
 
             @Override
             public int read(byte[] b, int off, int len) throws IOException {
                 int read = in.read(b, off, len);
                 if (read > 0)
-                    ctx.incrementSize(-read);
+                    ctx.incrementSize(read);
                 return read;
             }
 
             @Override
             public long skip(long n) throws IOException {
                 long skip = in.skip(n);
-                ctx.incrementSize(-skip);
+                ctx.incrementSize(skip);
                 return skip;
             }