| commit | 207185f15b92b1abef3749d740d89d82dad9d749 | [log] [tgz] |
|---|---|---|
| author | Felix Meschberger <fmeschbe@apache.org> | Wed Feb 26 17:00:42 2014 +0000 |
| committer | Felix Meschberger <fmeschbe@apache.org> | Wed Feb 26 17:00:42 2014 +0000 |
| tree | 44dba3e020a4790ddbdb6a19037bb5baf25782fc | |
| parent | 921f8d2cab939a1c1dbed3431933b892a43c9f14 [diff] |
FELIX-4438 Set jetty.version system property injecting the correct Jetty version into the Jetty Server class. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1572163 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java index 04c5982..8e6d416 100644 --- a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java +++ b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
@@ -284,7 +284,11 @@ // FELIX-4311: report the real version of Jetty... Dictionary headers = this.context.getBundle().getHeaders(); String version = (String) headers.get("X-Jetty-Version"); - if (version == null) + if (version != null) + { + System.setProperty("jetty.version", version); + } + else { version = Server.getVersion(); }