Author: abelevich Date: 2011-02-18 11:58:26 -0500 (Fri, 18 Feb 2011) New Revision: 21774 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java Log: RF-10054 Panels: attributes bypassUpdates and immediate ignored - NPE checking was added. Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-02-18 16:51:30 UTC (rev 21773) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-02-18 16:58:26 UTC (rev 21774) @@ -96,15 +96,18 @@ if (previous == null || !previous.equalsIgnoreCase(activeItem)) { AbstractPanelMenuItem prevItm = null; + AbstractPanelMenuItem actItm = null; if (previous != null) { prevItm = getItem(previous); } - AbstractPanelMenuItem actItm = getItem(activeItem); + if (activeItem != null) { + actItm = getItem(activeItem); + } ItemChangeEvent event = new ItemChangeEvent(this, previous,prevItm, activeItem, actItm); if (isImmediate() || (actItm != null && actItm.isImmediate())) { event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES); - } else if (actItm.isBypassUpdates()) { + } else if (actItm!= null && actItm.isBypassUpdates()) { event.setPhaseId(PhaseId.PROCESS_VALIDATIONS); } else { event.setPhaseId(PhaseId.INVOKE_APPLICATION); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-02-18 16:51:30 UTC (rev 21773) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2011-02-18 16:58:26 UTC (rev 21774) @@ -388,11 +388,15 @@ setSubmittedActiveItem(null); if (previous == null || !previous.equalsIgnoreCase(activeItem)) { UIComponent prevComp = null; - UIComponent actvComp = (UIComponent)getItem(activeItem); + UIComponent actvComp = null; if (previous != null) { prevComp = (UIComponent)getItem(previous); } + if (activeItem != null) { + actvComp = (UIComponent)getItem(activeItem); + } + new ItemChangeEvent(this, previous, prevComp, activeItem, actvComp).queue(); } }