Repository: johnzon Updated Branches: refs/heads/master b3e496efc -> 20b5635cd
JOHNZON-90 avoid to fail on closing jsonb instances Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/20b5635c Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/20b5635c Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/20b5635c Branch: refs/heads/master Commit: 20b5635cd2208c8336ef7d4d511fed27a44a6a0c Parents: b3e496e Author: Romain manni-Bucau <[email protected]> Authored: Mon Jul 11 18:41:35 2016 +0200 Committer: Romain manni-Bucau <[email protected]> Committed: Mon Jul 11 18:41:35 2016 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java | 2 +- .../java/org/apache/johnzon/jsonb/cdi/JohnzonCdiExtension.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/johnzon/blob/20b5635c/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java ---------------------------------------------------------------------- diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java index da23f6a..673877a 100644 --- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java +++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java @@ -307,7 +307,7 @@ public class JohnzonBuilder implements JsonbBuilder { }); }); - final boolean useCdi = cdiIntegration != null && cdiIntegration.isCanWrite(); + final boolean useCdi = cdiIntegration != null && cdiIntegration.isCanWrite() && config.getProperty("johnzon.cdi.activated").map(Boolean.class::cast).orElse(Boolean.TRUE); final Mapper mapper = builder.addCloseable(accessMode).build(); return useCdi ? new JohnsonJsonb(mapper) { http://git-wip-us.apache.org/repos/asf/johnzon/blob/20b5635c/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/JohnzonCdiExtension.java ---------------------------------------------------------------------- diff --git a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/JohnzonCdiExtension.java b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/JohnzonCdiExtension.java index d925659..17dae3c 100644 --- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/JohnzonCdiExtension.java +++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/cdi/JohnzonCdiExtension.java @@ -69,7 +69,7 @@ public class JohnzonCdiExtension implements Extension { void cleanUp(@Observes final BeforeShutdown beforeShutdown) { canWrite = false; - jsonbs.forEach(this::untrack); + new ArrayList<>(jsonbs).forEach(this::untrack); jsonbs.clear(); } }
