Author: nbelaevski Date: 2009-05-29 13:33:59 -0400 (Fri, 29 May 2009) New Revision: 14415 Modified: branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java Log: https://jira.jboss.org/jira/browse/RF-7273 Modified: branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java =================================================================== --- branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java 2009-05-29 17:31:38 UTC (rev 14414) +++ branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java 2009-05-29 17:33:59 UTC (rev 14415) @@ -98,8 +98,10 @@ return true; } - return expandedNodes.contains(rowKey) || - NodeState.EXPANDED.equals(queuedNodeStates.get(rowKey)); + NodeState queuedNodeState = queuedNodeStates.get(rowKey); + + return expandedNodes.contains(rowKey) && !NodeState.COLLAPSED.equals(queuedNodeState) || + NodeState.EXPANDED.equals(queuedNodeState); } public boolean isSelected(TreeRowKey rowKey) {