From bb0e1a1523ecb74e258e8e5289f493a40a02f31b Mon Sep 17 00:00:00 2001 From: Andy Armaignac Date: Wed, 14 Oct 2020 13:31:20 -0400 Subject: [PATCH] Fixed ISSUE-308: Check null value in language property When a customer is synchronized with a null value in the language property an exception is thrown. Added a new null check to the language property --- src/org/openbravo/retail/posterminal/CustomerLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/openbravo/retail/posterminal/CustomerLoader.java b/src/org/openbravo/retail/posterminal/CustomerLoader.java index 5e3f2bd7b..c6d49e659 100644 --- a/src/org/openbravo/retail/posterminal/CustomerLoader.java +++ b/src/org/openbravo/retail/posterminal/CustomerLoader.java @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012-2018 Openbravo S.L.U. + * Copyright (C) 2012-2020 Openbravo S.L.U. * Licensed under the Openbravo Commercial License version 1.0 * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html * or in the legal folder of this module distribution. @@ -422,7 +422,7 @@ public class CustomerLoader extends POSDataSynchronizationProcess private void setBpLanguage(BusinessPartner customer, final JSONObject jsonCustomer) throws JSONException { - if (jsonCustomer.has("language")) { + if (jsonCustomer.has("language") && jsonCustomer.get("language") != JSONObject.NULL) { Object adLanguage = jsonCustomer.get("language"); OBCriteria obCriteria = OBDal.getInstance().createCriteria(Language.class); obCriteria.add(Restrictions.eq(Language.PROPERTY_LANGUAGE, adLanguage)); -- 2.25.1