[RESTEASY-1580] Prevent NPE

resteasy · Feb 2, 2017 · dd2f05e · dd2f05e
1 parent 73ad62a
commit dd2f05e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/resteasy-spring/src/main/java/org/jboss/resteasy/plugins/spring/SpringBeanProcessor.java b/resteasy-spring/src/main/java/org/jboss/resteasy/plugins/spring/SpringBeanProcessor.java
@@ -127,7 +127,7 @@ else if(registrations.contains(beanName) && bean instanceof ResteasyRegistration
             resourceFactories.put(registeredBeanName, resourceFactory);
          }
 
-         else if (bean instanceof ResteasyDeployment) {
+         else if (bean instanceof ResteasyDeployment && deployment != null) {
             ResteasyDeployment beanDeployment = (ResteasyDeployment) bean;
             deployment.merge(beanDeployment);
             deployment.start();