You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/11/14 10:16:56 UTC
[tomcat] branch master updated (92a198d -> 6f3d3b8)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 92a198d Polish. Javadoc in expected order
new 81e407f Increment version for next development cycyle
new 6f3d3b8 Polish. Align with 8.5.x/7.0.x
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.properties.default | 2 +-
java/org/apache/jasper/servlet/JspServletWrapper.java | 3 ++-
res/maven/mvn.properties.default | 2 +-
webapps/docs/changelog.xml | 4 +++-
4 files changed, 7 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Increment version for next development cycyle
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 81e407f87a924f35fa86b6476d07fdc162146489
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 14 10:16:02 2019 +0000
Increment version for next development cycyle
---
build.properties.default | 2 +-
res/maven/mvn.properties.default | 2 +-
webapps/docs/changelog.xml | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 233c6a2..63efecb 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
# ----- Version Control Flags -----
version.major=9
version.minor=0
-version.build=28
+version.build=29
version.patch=0
version.suffix=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 2b50dd9..3c78539 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
maven.asf.release.repo.repositoryId=apache.releases.https
# Release version info
-maven.asf.release.deploy.version=9.0.28
+maven.asf.release.deploy.version=9.0.29
#Where do we load the libraries from
tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bf9dacc..1d6ead2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -44,7 +44,9 @@
They eventually become mixed with the numbered issues (i.e., numbered
issues do not "pop up" wrt. others).
-->
-<section name="Tomcat 9.0.28 (markt)" rtext="in development">
+<section name="Tomcat 9.0.29 (markt)" rtext="in development">
+</section>
+<section name="Tomcat 9.0.28 (markt)" rtext="release in progress">
<subsection name="Catalina">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Polish. Align with 8.5.x/7.0.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6f3d3b8d19651f862727528b367cb5956bc75155
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 14 10:16:21 2019 +0000
Polish. Align with 8.5.x/7.0.x
---
java/org/apache/jasper/servlet/JspServletWrapper.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java b/java/org/apache/jasper/servlet/JspServletWrapper.java
index a422d61..dbfd731 100644
--- a/java/org/apache/jasper/servlet/JspServletWrapper.java
+++ b/java/org/apache/jasper/servlet/JspServletWrapper.java
@@ -281,6 +281,7 @@ public class JspServletWrapper {
synchronized (this) {
if (getReloadInternal() || tagHandlerClass == null) {
tagHandlerClass = ctxt.load();
+ // Volatile 'reload' forces in order write of 'tagHandlerClass'
reload = false;
}
}
@@ -326,7 +327,7 @@ public class JspServletWrapper {
}
}
}
- target = tagHandlerClass.newInstance();
+ target = tagHandlerClass.getConstructor().newInstance();
} else {
target = getServlet();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org