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

IDEMPIERE-4998 : NPE when saving a SysConfig from code (#920) 

* IDEMPIERE-4998 : NPE when saving a SysConfig from code

fix missing parenthesis and remove .bak file

Co-Authored-By: Carlos Ruiz <carg67@gmail.com>
This commit is contained in:
Nicolas Micoud 2021-10-12 17:16:44 +02:00 committed by GitHub
parent 5f39c14e31
commit 08b2c28207
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.adempiere.base/src/org/compiere/model/MSysConfig.java
View File

@ -28,6 +28,7 @@ import org.compiere.util.CCache;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.DisplayType;
import org.compiere.util.Util;
/**
* System Configuration
@ -43,7 +44,7 @@ public class MSysConfig extends X_AD_SysConfig
/**
*
*/
private static final long serialVersionUID = 2454757193097243912L;
private static final long serialVersionUID = -7342115034093804064L;
public static final String ADDRESS_VALIDATION = "ADDRESS_VALIDATION";
public static final String ALERT_SEND_ATTACHMENT_AS_XLS = "ALERT_SEND_ATTACHMENT_AS_XLS";
@ -815,7 +816,7 @@ public class MSysConfig extends X_AD_SysConfig
// fix possible wrong config level
if (getAD_Org_ID() != 0)
setConfigurationLevel(CONFIGURATIONLEVEL_Organization);
else if (getAD_Client_ID() != 0 && getConfigurationLevel().equals(MSysConfig.CONFIGURATIONLEVEL_System))
else if (getAD_Client_ID() != 0 && (Util.isEmpty(getConfigurationLevel()) || getConfigurationLevel().equals(MSysConfig.CONFIGURATIONLEVEL_System)))
setConfigurationLevel(CONFIGURATIONLEVEL_Client);
}