diff --git a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED index c0407c965bc0a3dfda23de444ad9b9b167b903d9..fce17d66062af1f66c5358d8015f223e9e69c5a0 100755 --- a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties-MERGED @@ -2,6 +2,10 @@ Installer.closing.confirmationDialog.message=Ingest is running, are you sure you Installer.closing.confirmationDialog.title=Ingest is Running # {0} - exception message Installer.closing.messageBox.caseCloseExceptionMessage=Error closing case: {0} +# {0} - maxMemory +Installer_checkMemoryAvailable_maxMemExpected_desc=Maximum JVM memory: {0}, is less than the 2 GB required. Some aspects of the application may not work as expected. +# {0} - physicalMemory +Installer_checkMemoryAvailable_physicalRamExpected_desc=Physical memory: {0}, is less than the 8 GB required. Some aspects of the application may not work as expected. OpenIDE-Module-Display-Category=Infrastructure OpenIDE-Module-Long-Description=\ This is the core Autopsy module.\n\n\ diff --git a/Core/src/org/sleuthkit/autopsy/core/Installer.java b/Core/src/org/sleuthkit/autopsy/core/Installer.java index c3b44d324bbd49df7ca3d90fbc49c6c5aff62b70..0cbafe987e268ad00099d5c8243011deb8e2a83f 100644 --- a/Core/src/org/sleuthkit/autopsy/core/Installer.java +++ b/Core/src/org/sleuthkit/autopsy/core/Installer.java @@ -402,15 +402,15 @@ public void restored() { */ @Messages({ "# {0} - physicalMemory", - "Installer_checkMemoryAvailable_physicalRamExpected_desc=Physical memory: {0}, is less than the 8GB required. Some aspects of the application may not work as expected.", + "Installer_checkMemoryAvailable_physicalRamExpected_desc=Physical memory: {0}, is less than the 8 GB required. Some aspects of the application may not work as expected.", "# {0} - maxMemory", - "Installer_checkMemoryAvailable_maxMemExpected_desc=Maximum JVM memory: {0}, is less than the 2GB required. Some aspects of the application may not work as expected." + "Installer_checkMemoryAvailable_maxMemExpected_desc=Maximum JVM memory: {0}, is less than the 2 GB required. Some aspects of the application may not work as expected." }) private void checkMemoryAvailable() { try { long memorySize = ((com.sun.management.OperatingSystemMXBean) ManagementFactory .getOperatingSystemMXBean()).getTotalMemorySize(); - if (memorySize < 8_000_000) { + if (memorySize < 8_000_000_000L) { String desc = Bundle.Installer_checkMemoryAvailable_physicalRamExpected_desc( FileUtils.byteCountToDisplaySize(memorySize)); logger.log(Level.SEVERE, desc); @@ -421,7 +421,7 @@ private void checkMemoryAvailable() { try { long maxMemory = Runtime.getRuntime().maxMemory(); - if (maxMemory < 2_000_000) { + if (maxMemory < 2_000_000_000L) { String desc = Bundle.Installer_checkMemoryAvailable_maxMemExpected_desc( FileUtils.byteCountToDisplaySize(maxMemory)); logger.log(Level.SEVERE, desc);