You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2014/12/15 12:05:25 UTC

svn commit: r1645621 - /myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java

Author: weber
Date: Mon Dec 15 11:05:25 2014
New Revision: 1645621

URL: http://svn.apache.org/r1645621
Log:
TOBAGO-1431 - NPE decoding tree state

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java?rev=1645621&r1=1645620&r2=1645621&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java Mon Dec 15 11:05:25 2014
@@ -410,27 +410,31 @@ public class RenderUtils {
       final TreePath path = data.getPath();
 
       // selected
-      final SelectedState selectedState = data.getSelectedState();
-      final boolean oldSelected = selectedState.isSelected(path);
-      final boolean newSelected = selectedIndices.contains(rowIndex);
-      if (newSelected != oldSelected) {
-        if (newSelected) {
-          selectedState.select(path);
-        } else {
-          selectedState.unselect(path);
+      if (selectedIndices != null) {
+        final SelectedState selectedState = data.getSelectedState();
+        final boolean oldSelected = selectedState.isSelected(path);
+        final boolean newSelected = selectedIndices.contains(rowIndex);
+        if (newSelected != oldSelected) {
+          if (newSelected) {
+            selectedState.select(path);
+          } else {
+            selectedState.unselect(path);
+          }
         }
       }
 
       // expanded
       if (expandedIndices != null) {
-        final ExpandedState expandedState = data.getExpandedState();
-        final boolean oldExpanded = expandedState.isExpanded(path);
-        final boolean newExpanded = expandedIndices.contains(rowIndex);
-        if (newExpanded != oldExpanded) {
-          if (newExpanded) {
-            expandedState.expand(path);
-          } else {
-            expandedState.collapse(path);
+        if (expandedIndices != null) {
+          final ExpandedState expandedState = data.getExpandedState();
+          final boolean oldExpanded = expandedState.isExpanded(path);
+          final boolean newExpanded = expandedIndices.contains(rowIndex);
+          if (newExpanded != oldExpanded) {
+            if (newExpanded) {
+              expandedState.expand(path);
+            } else {
+              expandedState.collapse(path);
+            }
           }
         }
       }