| commit | 94145cca686a082edc2f3275ad9b8665527a57d5 | [log] [tgz] |
|---|---|---|
| author | Thomas Andraschko <tandraschko@apache.org> | Fri Feb 26 10:56:59 2021 +0100 |
| committer | GitHub <noreply@github.com> | Fri Feb 26 10:56:59 2021 +0100 |
| tree | 4b361cf16ca69943ceaf43dbbb94d21cd3153987 | |
| parent | 154a75d9b8988808ccbe7ae6af029f6e814dde80 [diff] | |
| parent | 563f1cbba0e1a368ccb785847b4d299a8c7fac65 [diff] |
Merge pull request #113 from lorenzleutgeb/patch-1 Avoid NPE in WindowContextImpl
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 @@ @Override public String getCurrentWindowId() { + if (windowHolder == null) + { + return null; + } + return windowIdHolder.getWindowId(); }