Am 2019-04-11 um 21:49 schrieb csuth...@apache.org:
This is an automated email from the ASF dual-hosted git repository.
csutherl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new c8748aa Update ServerInfo to reflect actual information instead of
placeholders when running development builds
c8748aa is described below
commit c8748aaf9f3f7bc9f38c5805ed80e1a333696216
Author: Coty Sutherland <csuth...@apache.org>
AuthorDate: Thu Apr 11 15:45:55 2019 -0400
Update ServerInfo to reflect actual information instead of placeholders
when running development builds
---
java/org/apache/catalina/util/ServerInfo.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/util/ServerInfo.java
b/java/org/apache/catalina/util/ServerInfo.java
index 020d926..a70b5bf 100644
--- a/java/org/apache/catalina/util/ServerInfo.java
+++ b/java/org/apache/catalina/util/ServerInfo.java
@@ -68,11 +68,11 @@ public class ServerInfo {
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
}
- if (info == null)
- info = "Apache Tomcat 9.0.x-dev";
- if (built == null)
+ if (info == null || info.equals("Apache Tomcat/@VERSION@"))
+ info = "Apache Tomcat/9.0.x-dev";
+ if (built == null || built.equals("@VERSION_BUILT@"))
built = "unknown";
- if (number == null)
+ if (number == null || number.equals("@VERSION_NUMBER@"))
number = "9.0.x";
I don't like such an approach. This isn't Java, this is the
C-define-from-external approach.
The better approach is to read a build.properties at runtime.
Michael
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
