midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "IDEMPIERE-3551: set AUTOMATIC_PACKIN_FOLDERS by system properties to override configuration on database" 

This reverts commit a1f1b609af.
This commit is contained in:
Carlos Ruiz 2020-04-24 20:31:59 +02:00
parent f156a01676
commit 6fb899bef2
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/PackInApplicationActivator.java
View File

@ -342,17 +342,13 @@ public class PackInApplicationActivator extends AbstractActivator{
@Override @Override
protected void frameworkStarted() { protected void frameworkStarted() {
if (service != null) { 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) { if (Adempiere.getThreadPoolExecutor() != null) {
Adempiere.getThreadPoolExecutor().execute(new Runnable() { Adempiere.getThreadPoolExecutor().execute(new Runnable() {
@Override @Override
public void run() { public void run() {
int timeout = MSysConfig.getIntValue(MSysConfig.AUTOMATIC_PACKIN_INITIAL_DELAY, 120) * 1000; 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 { } else {
@ -361,7 +357,8 @@ public class PackInApplicationActivator extends AbstractActivator{
public void stateChange(ServerStateChangeEvent event) { public void stateChange(ServerStateChangeEvent event) {
if (event.getEventType() == ServerStateChangeEvent.SERVER_START && service != null) { if (event.getEventType() == ServerStateChangeEvent.SERVER_START && service != null) {
int timeout = MSysConfig.getIntValue(MSysConfig.AUTOMATIC_PACKIN_INITIAL_DELAY, 120) * 1000; 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);
} }
} }
}); });