svn commit: r1580161 - in /tomee/tomee/trunk/server: openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java

[dblevins]

Author: dblevins
Date: Sat Mar 22 04:28:53 2014
New Revision: 1580161

URL: http://svn.apache.org/r1580161
Log:
Ensure there is an AppContext when possible

Modified:
    
tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
    
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.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=1580161&r1=1580160&r2=1580161&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
 Sat Mar 22 04:28:53 2014
@@ -17,6 +17,7 @@
 
 package org.apache.openejb.server.rest;
 
+import org.apache.openejb.AppContext;
 import org.apache.openejb.BeanContext;
 import org.apache.openejb.BeanType;
 import org.apache.openejb.Injection;
@@ -912,7 +913,8 @@ public abstract class RESTService implem
         if (assembler != null) {
             SystemInstance.get().addObserver(this);
             for (final AppInfo appInfo : assembler.getDeployedApplications()) {
-                afterApplicationCreated(new StartApplicationContext(appInfo, 
null));
+                final AppContext appContext = 
containerSystem.getAppContext(appInfo.appId);
+                afterApplicationCreated(new StartApplicationContext(appInfo, 
appContext));
             }
         }
     }

Modified: 
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java?rev=1580161&r1=1580160&r2=1580161&view=diff
==============================================================================
--- 
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
 (original)
+++ 
tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
 Sat Mar 22 04:28:53 2014
@@ -17,6 +17,7 @@
  */
 package org.apache.openejb.server.webservices;
 
+import org.apache.openejb.AppContext;
 import org.apache.openejb.BeanContext;
 import org.apache.openejb.Injection;
 import org.apache.openejb.assembler.classic.AppInfo;
@@ -185,7 +186,8 @@ public abstract class WsService implemen
         if (assembler != null) {
             SystemInstance.get().addObserver(this);
             for (final AppInfo appInfo : assembler.getDeployedApplications()) {
-                afterApplicationCreated(new StartApplicationContext(appInfo, 
null));
+                final AppContext appContext = 
containerSystem.getAppContext(appInfo.appId);
+                afterApplicationCreated(new StartApplicationContext(appInfo, 
appContext));
             }
         }
     }