Fix a side-effect of ZK-5707 for B86-ZK-4275.zul test case.

zkoss · Oct 8, 2024 · f3fb280 · f3fb280
1 parent aa99a6d
commit f3fb280
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/zk/src/main/java/org/zkoss/zk/ui/impl/UiEngineImpl.java b/zk/src/main/java/org/zkoss/zk/ui/impl/UiEngineImpl.java
@@ -718,7 +718,11 @@ private Extension getExtension() {
 
 	private static final Event nextEvent(UiVisualizer uv) {
 		final Event evt = ((ExecutionCtrl) uv.getExecution()).getNextEvent();
-		return evt != null && !uv.isAborting()  && !((SessionCtrl) Sessions.getCurrent()).isInvalidated() ? evt : null;
+		if (evt != null && !uv.isAborting() && (Sessions.getCurrent() == null
+				|| !((SessionCtrl) Sessions.getCurrent()).isInvalidated())) {
+			return evt;
+		}
+		return null;
 	}
 
 	/** Cycle 1: