Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-05-28 04:58:21 +0000
committerJan Bartel2013-05-28 04:58:21 +0000
commit82b0ae2c638025e0aa31a2429003181e06ed97a8 (patch)
tree91bba66ea3848b50c6b036250d07674d450ace7a
parent7e797d8eed51962c510cc4d7d0dc39691a2386c8 (diff)
downloadorg.eclipse.jetty.project-82b0ae2c638025e0aa31a2429003181e06ed97a8.tar.gz
org.eclipse.jetty.project-82b0ae2c638025e0aa31a2429003181e06ed97a8.tar.xz
org.eclipse.jetty.project-82b0ae2c638025e0aa31a2429003181e06ed97a8.zip
Ensure jetty.home set as Server attribute on defaultJettyServer instance
-rw-r--r--jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java
index fdfbf2845c..8d02dd2a9c 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java
@@ -168,6 +168,8 @@ public class DefaultJettyAtJettyHomeHelper
Util.setProperty(properties, OSGiServerConstants.JETTY_PORT_SSL, System.getProperty(OSGiServerConstants.JETTY_PORT_SSL));
Server server = ServerInstanceWrapper.configure(null, configURLs, properties);
+ //ensure jetty.home is set
+ server.setAttribute(OSGiServerConstants.JETTY_HOME, properties.get(OSGiServerConstants.JETTY_HOME));
//Register the default Server instance as an OSGi service.
//The JettyServerServiceTracker will notice it and set it up to deploy bundles as wars etc

Back to the top