Repository: aries-jax-rs-whiteboard
Updated Branches:
  refs/heads/master d9e5f2d06 -> f7542f178


[ARIES-1784] Add null check


Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/f7542f17
Tree: 
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/f7542f17
Diff: 
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/f7542f17

Branch: refs/heads/master
Commit: f7542f178c70ccf5193f84f431d64711054e0ab6
Parents: d9e5f2d
Author: Carlos Sierra <csie...@apache.org>
Authored: Tue Mar 13 19:08:46 2018 +0100
Committer: Carlos Sierra <csie...@apache.org>
Committed: Tue Mar 13 19:08:46 2018 +0100

----------------------------------------------------------------------
 .../rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java   | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/f7542f17/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java
----------------------------------------------------------------------
diff --git 
a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java
 
b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java
index 4f7c894..760b9a4 100644
--- 
a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java
+++ 
b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/cxf/CxfJaxrsServiceRegistrator.java
@@ -142,6 +142,10 @@ public class CxfJaxrsServiceRegistrator {
     }
 
     public Iterable<Class<?>> getStaticResourceClasses() {
+        if (_jaxRsServerFactoryBean == null) {
+            return Collections.emptyList();
+        }
+
         JAXRSServiceFactoryBean serviceFactory =
             _jaxRsServerFactoryBean.getServiceFactory();
 

Reply via email to