Author: chris.laprun(a)jboss.com Date: 2008-10-03 12:20:44 -0400 (Fri, 03 Oct 2008) New Revision: 12030 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java Log: - JBPORTAL-2184: fixed NPE, cleaned-up code at the same time. Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java 2008-10-03 15:21:36 UTC (rev 12029) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java 2008-10-03 16:20:44 UTC (rev 12030) @@ -49,10 +49,10 @@ private PortalRuntimeContext prc; public PortalNodeEventContextImpl( - PortalEventListenerRegistry registry, - PortalNodeImpl node, - PortalNodeEvent event, - PortalRuntimeContext prc) + PortalEventListenerRegistry registry, + PortalNodeImpl node, + PortalNodeEvent event, + PortalRuntimeContext prc) { this.registry = registry; this.node = node; @@ -78,37 +78,29 @@ } } - // Dispatch to the listener + // Dispatch PortalNodeEvent nextEvent = null; - if (listener != null) + PortalNode parent = node.getParent(); + if (parent != null) { PortalNodeImpl current = node; try { - node = (PortalNodeImpl)node.getParent(); - nextEvent = listener.onEvent(this, event); + node = (PortalNodeImpl)parent; + if (listener != null) + { + nextEvent = listener.onEvent(this, event); + } + else + { + nextEvent = dispatch(); + } } finally { node = current; } } - else - { - if (node.getParent() != null) - { - PortalNodeImpl current = node; - try - { - node = (PortalNodeImpl)node.getParent(); - nextEvent = dispatch(); - } - finally - { - node = current; - } - } - } // return nextEvent;