Check for null
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fdadd4fa Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fdadd4fa Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fdadd4fa Branch: refs/heads/tomee-1.7.x Commit: fdadd4fa8020387d29bb43b2becf21ae41017a79 Parents: 6f16957 Author: AndyGee <[email protected]> Authored: Fri Feb 10 01:20:26 2017 +0100 Committer: AndyGee <[email protected]> Committed: Fri Feb 10 01:20:26 2017 +0100 ---------------------------------------------------------------------- .../apache/openejb/server/cxf/rs/CdiResourceProvider.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/fdadd4fa/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CdiResourceProvider.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CdiResourceProvider.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CdiResourceProvider.java index 506a786..65ba232 100644 --- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CdiResourceProvider.java +++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CdiResourceProvider.java @@ -245,7 +245,7 @@ public abstract class CdiResourceProvider implements ResourceProvider { } } - protected static interface BeanCreator { + protected interface BeanCreator { Object create(); void release(); @@ -290,8 +290,10 @@ public abstract class CdiResourceProvider implements ResourceProvider { @Override public void release() { - toClean.release(); - toClean = null; + if (null != toClean) { + toClean.release(); + toClean = null; + } } }
