Author: rmannibucau
Date: Thu May 23 16:40:34 2013
New Revision: 1485773
URL: http://svn.apache.org/r1485773
Log:
TOMEE-946 avoiding npe for rest integration and ears
Modified:
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Modified:
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1485773&r1=1485772&r2=1485773&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
(original)
+++
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Thu May 23 16:40:34 2013
@@ -623,6 +623,10 @@ public abstract class RESTService implem
for (final EnterpriseBeanInfo bean : ejbJar.enterpriseBeans) {
if (bean.restService) {
final BeanContext beanContext =
containerSystem.getBeanContext(bean.ejbDeploymentId);
+ if (beanContext == null) { // ear
+ continue;
+ }
+
if
(containsJaxRsConfiguration(beanContext.getProperties())) {
appInfo.properties.setProperty(OPENEJB_USE_APPLICATION_PROPERTY, "false");
logOldDeploymentUsage(bean.ejbClass);
@@ -653,7 +657,9 @@ public abstract class RESTService implem
final Map<String, EJBRestServiceInfo> restEjbs = new HashMap<String,
EJBRestServiceInfo>();
for (final WebAppInfo webApp : appInfo.webApps) {
for (final String ejb : webApp.ejbRestServices) {
- restEjbs.put(ejb, new EJBRestServiceInfo(webApp.contextRoot,
beanContexts.get(ejb)));
+ if (beanContexts.containsKey(ejb)) {
+ restEjbs.put(ejb, new
EJBRestServiceInfo(webApp.contextRoot, beanContexts.get(ejb)));
+ } // else ear probably
}
}
for (final Map.Entry<String, BeanContext> ejbs :
beanContexts.entrySet()) {
