Repository: cxf Updated Branches: refs/heads/master 74b8db2dc -> cf252d226
[CXF-7282] Fixing a typo Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cf252d22 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cf252d22 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cf252d22 Branch: refs/heads/master Commit: cf252d226a1db2086cbd9f83fb3ab40f4acbfbff Parents: 74b8db2 Author: Sergey Beryozkin <[email protected]> Authored: Mon Mar 13 14:40:42 2017 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Mon Mar 13 14:40:42 2017 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/cf252d22/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java index 155c892..4b34eea 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java @@ -417,7 +417,7 @@ public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { protected boolean isAppResourceLifecycleASingleton(Application app, ServletConfig servletConfig) { String scope = servletConfig.getInitParameter(SERVICE_SCOPE_PARAM); - if (scope != null) { + if (scope == null) { scope = (String)app.getProperties().get(SERVICE_SCOPE_PARAM); } return SERVICE_SCOPE_SINGLETON.equals(scope);
