[deltaspike] branch master updated: Avoid NPE in WindowContextImpl

[tandraschko]

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git


The following commit(s) were added to refs/heads/master by this push:
     new 563f1cb  Avoid NPE in WindowContextImpl
     new 94145cc  Merge pull request #113 from lorenzleutgeb/patch-1
563f1cb is described below

commit 563f1cbba0e1a368ccb785847b4d299a8c7fac65
Author: Lorenz Leutgeb <lor...@leutgeb.xyz>
AuthorDate: Wed Sep 16 21:38:12 2020 +0200

    Avoid NPE in WindowContextImpl
---
 .../apache/deltaspike/core/impl/scope/window/WindowContextImpl.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
index 0ad8440..a9ad9c8 100644
--- 
a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
+++ 
b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java
@@ -82,6 +82,11 @@ public class WindowContextImpl extends AbstractContext 
implements WindowContext
     @Override
     public String getCurrentWindowId()
     {
+        if (windowHolder == null)
+        {
+            return null;
+        }
+
         return windowIdHolder.getWindowId();
     }