diff --git a/modules/dcache/src/main/java/diskCacheV111/replicaManager/ReplicaDbV1.java b/modules/dcache/src/main/java/diskCacheV111/replicaManager/ReplicaDbV1.java index ba14048772d..97a52c1dcde 100644 --- a/modules/dcache/src/main/java/diskCacheV111/replicaManager/ReplicaDbV1.java +++ b/modules/dcache/src/main/java/diskCacheV111/replicaManager/ReplicaDbV1.java @@ -13,14 +13,13 @@ import java.sql.SQLException; import java.sql.Statement; import java.text.MessageFormat; +import java.util.Collections; import java.util.Iterator; import java.util.List; import diskCacheV111.repository.CacheRepositoryEntryInfo; import diskCacheV111.util.PnfsId; - import dmg.cells.nucleus.CellAdapter; -import java.util.Collections; import static org.dcache.commons.util.SqlHelper.tryToClose; @@ -143,16 +142,15 @@ public synchronized void addPnfsToPool(List fileList, // table String pnfsId = info.getPnfsId().toString(); int bitmask = info.getBitMask(); + boolean notRemovable = info.isPrecious() || + (info.isCached() && info.isSticky()); boolean countable = - info.isPrecious() && -// info.isCached() && + notRemovable && !info.isReceivingFromClient() && !info.isReceivingFromStore() && -// info.isSendingToStore() && !info.isBad() && !info.isRemoved() && !info.isDestroyed(); -// info.isSticky(); try { pstmt.setString(1, pnfsId);