Update OnbFreeSpaceProvider.java

Fix for Freespacemode mixup
netarchivesuite · Sep 15, 2019 · aed496e · aed496e
1 parent 5aa217c
commit aed496e
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/common/common-core/src/main/java/dk/netarkivet/common/utils/OnbFreeSpaceProvider.java b/common/common-core/src/main/java/dk/netarkivet/common/utils/OnbFreeSpaceProvider.java
@@ -91,7 +91,8 @@ public class OnbFreeSpaceProvider implements FreeSpaceProvider {
 
     /**
      * Returns the number of bytes free on the file system that the given file resides on. Will return 0 on non-existing
-     * files, on read only files and if free space is lower than given freespacepercentage in settings.
+     * files, on read only files and if free space is lower than given freespacepercentage (in freespacemode percent) or 
+     * freespace (in freespacemode byte) in settings.
      *
      * @param f a given file
      * @return the number of bytes free.
@@ -108,14 +109,17 @@ public long getBytesFree(File f) {
             return 0;
         }
 
-        if (FREESPACEPROVIDER_FREESPACEMODE_BYTE.equals(FREESPACEPROVIDER_FREESPACEMODE)) {
+        log.debug("FreeSpaceMode is '{}'", FREESPACEPROVIDER_FREESPACEMODE);
+
+        if (FREESPACEPROVIDER_FREESPACEMODE_PERCENTAGE.equals(FREESPACEPROVIDER_FREESPACEMODE)) {
             long totalspace;
             long usable;
 
             totalspace = f.getTotalSpace();
             usable = f.getUsableSpace();
 
             double freeSpaceInPercent =  100.0 / totalspace * usable;
+            log.debug("Free space in percent is '{}'", freeSpaceInPercent);
 
             if (freeSpaceInPercent <= FREESPACEPROVIDER_MINFREESPACEPERCENTAGE) {
                 log.warn("Free space on '{}' is lower than '{}' percent. The value 0 returned.", f.getAbsolutePath(), FREESPACEPROVIDER_MINFREESPACEPERCENTAGE);
@@ -126,9 +130,11 @@ public long getBytesFree(File f) {
             }
         }
 
-        if (FREESPACEPROVIDER_FREESPACEMODE_PERCENTAGE.equals(FREESPACEPROVIDER_FREESPACEMODE)) {
+        if (FREESPACEPROVIDER_FREESPACEMODE_BYTE.equals(FREESPACEPROVIDER_FREESPACEMODE)) {
+            log.debug("Free space in byte is '{}'", f.getUsableSpace());
+
         	if (f.getUsableSpace() < FREESPACEPROVIDER_MINFREESPACE) {
-                log.warn("Free space on '{}' is lower than '{}' kb. The value 0 returned.", f.getAbsolutePath(), FREESPACEPROVIDER_MINFREESPACE);
+                log.warn("Free space on '{}' is lower than '{}' bytes. The value 0 returned.", f.getAbsolutePath(), FREESPACEPROVIDER_MINFREESPACE);
                 return 0;
         	}
         	else {