diff options
| author | Jan Bartel | 2013-02-28 08:48:42 +0000 |
|---|---|---|
| committer | Jan Bartel | 2013-02-28 08:48:42 +0000 |
| commit | 0ed363866048182813605f8e7f01acbb526997c5 (patch) | |
| tree | 6b689848035f83f6d0cb4511760fff3ef2fe9e8e /jetty-osgi/jetty-osgi-boot/src | |
| parent | ec083b4ecc0000f589e30f775c3cd9d74a090b4b (diff) | |
| download | org.eclipse.jetty.project-0ed363866048182813605f8e7f01acbb526997c5.tar.gz org.eclipse.jetty.project-0ed363866048182813605f8e7f01acbb526997c5.tar.xz org.eclipse.jetty.project-0ed363866048182813605f8e7f01acbb526997c5.zip | |
401966 Ensure OSGI WebApp as Service (WebAppContext) can be deployed only through ServiceWebAppProvider
Diffstat (limited to 'jetty-osgi/jetty-osgi-boot/src')
| -rw-r--r-- | jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java index b7630cb188..2e36904fc4 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java @@ -94,6 +94,9 @@ public class ServiceContextProvider extends AbstractContextProvider implements S if (context == null || serviceRef == null) return false; + if (context instanceof org.eclipse.jetty.webapp.WebAppContext) + return false; //the ServiceWebAppProvider will deploy it + String watermark = (String)serviceRef.getProperty(OSGiWebappConstants.WATERMARK); if (watermark != null && !"".equals(watermark)) return false; //this service represents a contexthandler that has already been registered as a service by another of our deployers |