Author: abelevich Date: 2011-02-16 08:05:01 -0500 (Wed, 16 Feb 2011) New Revision: 21693 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java Log: RF-10436 Panel Menu Item - doesn't fire item change listener when @bypassUpdates or @immediate is true when @mode=ajax 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-16 12:59:51 UTC (rev 21692) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2011-02-16 13:05:01 UTC (rev 21693) @@ -97,8 +97,11 @@ if (previous == null || !previous.equalsIgnoreCase(activeItem)) { AbstractPanelMenuItem prevItm = getItem(previous); AbstractPanelMenuItem actItm = getItem(activeItem); + ItemChangeEvent event = new ItemChangeEvent(this, previous, activeItem); - if (isImmediate() || (prevItm.isImmediate() || actItm.isImmediate())) { + if (isImmediate() || + ((prevItm != null && prevItm.isImmediate()) || + (actItm != null && actItm.isImmediate()))) { event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES); } else if (prevItm.isBypassUpdates() || actItm.isBypassUpdates()) { event.setPhaseId(PhaseId.PROCESS_VALIDATIONS);