2197 fixed bug with merge

This commit is contained in:
William Schaefer 2017-01-12 13:02:33 -05:00
parent 7c13d4941e
commit 6bbd3c820b

View File

@ -38,7 +38,7 @@ final class IngestSettingsPanel extends IngestModuleGlobalSettingsPanel {
Integer fileIngestThreadCountChoices[]; Integer fileIngestThreadCountChoices[];
int recommendedFileIngestThreadCount; int recommendedFileIngestThreadCount;
if (availableProcessors >= 6 && availableProcessors <= 7) { if (availableProcessors >= 6) {
fileIngestThreadCountChoices = new Integer[]{1, 2, 4, 6}; fileIngestThreadCountChoices = new Integer[]{1, 2, 4, 6};
recommendedFileIngestThreadCount = 4; recommendedFileIngestThreadCount = 4;
} else if (availableProcessors >= 4 && availableProcessors <= 5) { } else if (availableProcessors >= 4 && availableProcessors <= 5) {