From 6fb899bef23ac903b777972139755e082c7313b2 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 24 Apr 2020 20:31:59 +0200 Subject: [PATCH] Revert "IDEMPIERE-3551: set AUTOMATIC_PACKIN_FOLDERS by system properties to override configuration on database" This reverts commit a1f1b609af8c42830110b5cf8f294447f0dec705. --- .../plugin/utils/PackInApplicationActivator.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/PackInApplicationActivator.java b/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/PackInApplicationActivator.java index 7470392d2e..5666eafabd 100644 --- a/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/PackInApplicationActivator.java +++ b/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/PackInApplicationActivator.java @@ -342,17 +342,13 @@ public class PackInApplicationActivator extends AbstractActivator{ @Override protected void frameworkStarted() { if (service != null) { - String packinFolders = System.getProperty(MSysConfig.AUTOMATIC_PACKIN_FOLDERS); - if (packinFolders == null || packinFolders.trim().length() == 0) { - packinFolders = MSysConfig.getValue(MSysConfig.AUTOMATIC_PACKIN_FOLDERS); - } - final String fPackinFolders = packinFolders; if (Adempiere.getThreadPoolExecutor() != null) { Adempiere.getThreadPoolExecutor().execute(new Runnable() { @Override public void run() { int timeout = MSysConfig.getIntValue(MSysConfig.AUTOMATIC_PACKIN_INITIAL_DELAY, 120) * 1000; - automaticPackin(timeout, fPackinFolders, true); + String folders = MSysConfig.getValue(MSysConfig.AUTOMATIC_PACKIN_FOLDERS); + automaticPackin(timeout, folders, true); } }); } else { @@ -361,7 +357,8 @@ public class PackInApplicationActivator extends AbstractActivator{ public void stateChange(ServerStateChangeEvent event) { if (event.getEventType() == ServerStateChangeEvent.SERVER_START && service != null) { int timeout = MSysConfig.getIntValue(MSysConfig.AUTOMATIC_PACKIN_INITIAL_DELAY, 120) * 1000; - automaticPackin(timeout, fPackinFolders, true); + String folders = MSysConfig.getValue(MSysConfig.AUTOMATIC_PACKIN_FOLDERS); + automaticPackin(timeout, folders, true); } } });