possible NPE Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/41d31e83 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/41d31e83 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/41d31e83
Branch: refs/heads/master Commit: 41d31e83d488b1eb322c596ee6234108163214a2 Parents: 50190f0 Author: andraschko <[email protected]> Authored: Thu Jan 9 11:16:32 2014 +0100 Committer: andraschko <[email protected]> Committed: Thu Jan 9 11:16:32 2014 +0100 ---------------------------------------------------------------------- .../apache/deltaspike/core/util/context/AbstractContext.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/41d31e83/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java index 2857174..623266e 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/context/AbstractContext.java @@ -163,7 +163,10 @@ public abstract class AbstractContext implements Context for (ContextualStorage storage : storages) { - destroyAllActive(storage); + if (storage != null) + { + destroyAllActive(storage); + } } }
