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

IDEMPIERE-4649 NPE when running Change base language with a fake language (as instructed) (#529)

This commit is contained in:
Carlos Ruiz 2021-01-16 02:46:31 +01:00 committed by GitHub
parent efc3d98313
commit 0e366c9929
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.adempiere.base/src/org/compiere/util/Language.java
View File

@ -141,7 +141,8 @@ public class Language implements Serializable
if (dblang != null) { if (dblang != null) {
if (!( language.equals(dblang.getLanguageISO()) if (!( language.equals(dblang.getLanguageISO())
&& country.equals(dblang.getCountryCode()) && country.equals(dblang.getCountryCode())
) ) && dblang.getLanguageISO() != null
&& dblang.getCountryCode() != null
) { ) {
locale = new Locale(dblang.getLanguageISO(), dblang.getCountryCode()); locale = new Locale(dblang.getLanguageISO(), dblang.getCountryCode());
} }