Fix NPE introduced with fix for primefaces#4557

fanste · Feb 21, 2019 · c89ffa6 · c89ffa6
1 parent abc0a6b
commit c89ffa6
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/src/main/java/org/primefaces/component/datatable/DataTable.java b/src/main/java/org/primefaces/component/datatable/DataTable.java
@@ -1590,23 +1590,25 @@ public String getGroupedColumnIndexes() {
 
     public String getSortMetaOrder(FacesContext context) {
         List<SortMeta> multiSortMeta = getMultiSortMeta();
-        int size = multiSortMeta.size();
-        if (size > 0) {
-            StringBuilder sb = new StringBuilder();
-            sb.append("['");
-            for (int i = 0; i < size; i++) {
-                SortMeta sortMeta = multiSortMeta.get(i);
-                if (i > 0) {
-                    sb.append("','");
+        if (multiSortMeta != null) {
+            int size = multiSortMeta.size();
+            if (size > 0) {
+                StringBuilder sb = new StringBuilder();
+                sb.append("['");
+                for (int i = 0; i < size; i++) {
+                    SortMeta sortMeta = multiSortMeta.get(i);
+                    if (i > 0) {
+                        sb.append("','");
+                    }
+                    sb.append(sortMeta.getColumn().getClientId(context));
                 }
-                sb.append(sortMeta.getColumn().getClientId(context));
-            }
-            sb.append("']");
+                sb.append("']");
 
-            return sb.toString();
+                return sb.toString();
+            }
         }
         return null;
     }
 
 
-}
+}