| commit | f76410d24705ea7927e33245e4025d4f76c6d8eb | [log] [tgz] |
|---|---|---|
| author | David Blevins <david.blevins@gmail.com> | Wed May 12 13:39:38 2021 +0000 |
| committer | David Blevins <david.blevins@gmail.com> | Wed May 12 13:39:38 2021 +0000 |
| tree | 1a7c1e1bd19bf238ca97e4a10d1d7ff8a0b71174 | |
| parent | 194ec0b7dd647f09e0f7fda29193b938192cfd3e [diff] | |
| parent | 8dd89daec484a84b2dd8e0f97a29f87a4d4fd3a4 [diff] |
Merge branch 'master' of github.com:apache/tomee
diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java index 23f3f93..6abf1e9 100644 --- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java +++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -822,6 +822,11 @@ * com/sun/ts/tests/jaxrs/spec/context/server/JAXRSClient#applicationInjectionTest_from_standalone */ public static void injectApplication(final Application application, final JAXRSServerFactoryBean factory) { + + if (application == null) { + return; + } + /* * We may have wrapped the Application instance in an InternalApplication. If so, unwrap * it and do the injection on that instance.