Related to issue 26696 : Handled NPE
authorShankar Balachandran <shankar.balachandran@openbravo.com>
Tue, 24 Jun 2014 13:31:26 +0530
changeset 23860 391fdc807c26
parent 23859 4639ca577e0b
child 23861 3fbe45f3957e
Related to issue 26696 : Handled NPE
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Mon Jun 23 16:17:36 2014 +0200
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Tue Jun 24 13:31:26 2014 +0530
@@ -96,7 +96,7 @@
        * case if the field is a table reference, add the displayed column to list of columns to be
        * retrieved. Refer issue https://issues.openbravo.com/view.php?id=26696
        */
-      if (StringUtils.isNotEmpty(displayField)) {
+      if (StringUtils.isNotEmpty(displayField) && StringUtils.isNotEmpty(selectedProperties)) {
         for (String selectedProp : selectedProperties.split(",")) {
           if (selectedProp.equals(displayField)) {
             propertyPresent = true;