Fix primefaces#4797: ObjectUtils.resolveFieldData perf improvement

melloware · Aug 18, 2023 · c61ae8d · c61ae8d
1 parent 15b0368
commit c61ae8d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/components/lib/utils/ObjectUtils.js b/components/lib/utils/ObjectUtils.js
@@ -57,6 +57,11 @@ export default class ObjectUtils {
     }
 
     static resolveFieldData(data, field) {
+        if (!data || !field) {
+            // short circuit if there is nothing to resolve
+            return null;
+        }
+
         try {
             const value = data[field];
 
@@ -66,7 +71,7 @@ export default class ObjectUtils {
             // do nothing and continue to other methods to resolve field data
         }
 
-        if (data && Object.keys(data).length && field) {
+        if (Object.keys(data).length) {
             if (this.isFunction(field)) {
                 return field(data);
             } else if (ObjectUtils.isNotEmpty(data[field])) {
@@ -87,9 +92,9 @@ export default class ObjectUtils {
 
                 return value;
             }
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     static findDiffKeys(obj1, obj2) {