mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-12 07:56:16 +00:00
Merge pull request #6669 from eugene7646/SU_Solr_JVM_fix
Bug fix that prevented embedded Solr JVM heap size from being less than 2GB
This commit is contained in:
commit
07b9721a98
@ -82,7 +82,7 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
|
||||
private static final String CONFIG_FILE_EXTENSION = ".conf";
|
||||
private static final long ONE_BILLION = 1000000000L; //used to roughly convert system memory from bytes to gigabytes
|
||||
private static final int MEGA_IN_GIGA = 1024; //used to convert memory settings saved as megabytes to gigabytes
|
||||
private static final int DEFAULT_SOLR_HEAP_SIZE_MB = 2048;
|
||||
private static final int JVM_MEMORY_STEP_SIZE_MB = 512;
|
||||
private static final int MIN_MEMORY_IN_GB = 2; //the enforced minimum memory in gigabytes
|
||||
private static final Logger logger = Logger.getLogger(AutopsyOptionsPanel.class.getName());
|
||||
private String initialMemValue = Long.toString(Runtime.getRuntime().maxMemory() / ONE_BILLION);
|
||||
@ -114,7 +114,7 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
|
||||
// The cast to int in the following is to ensure that the correct SpinnerNumberModel
|
||||
// constructor is called.
|
||||
solrMaxHeapSpinner.setModel(new javax.swing.SpinnerNumberModel(UserPreferences.getMaxSolrVMSize(),
|
||||
DEFAULT_SOLR_HEAP_SIZE_MB, ((int) getSystemMemoryInGB()) * MEGA_IN_GIGA, DEFAULT_SOLR_HEAP_SIZE_MB));
|
||||
JVM_MEMORY_STEP_SIZE_MB, ((int) getSystemMemoryInGB()) * MEGA_IN_GIGA, JVM_MEMORY_STEP_SIZE_MB));
|
||||
|
||||
textFieldListener = new TextFieldListener();
|
||||
agencyLogoPathField.getDocument().addDocumentListener(textFieldListener);
|
||||
|
Loading…
x
Reference in New Issue
Block a user