[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x-validate (in module tomcat-8.5.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.5.x-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 45 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.5.x-validate : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-validate/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x-validate.html Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 22 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.19-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-8.5.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-8.19-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/commons-beanutils/dist/commons-beanutils-20190328.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.9-SNAPSHOT.jar:/srv/gump/pu blic/workspace/apache-commons/logging/target/commons-logging-20190328.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20190328.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar - Buildfile: /srv/gump/public/workspace/tomcat-8.5.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-8.5.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.5.x/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-8.19-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.5.x/output/res/checkstyle [checkstyle] Running Checkstyle 8.19-SNAPSHOT on 3243 files [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.5.x/java/org/apache/tomcat/util/net/Nio2Endpoint.java:740: Line matches the illegal pattern '\s+$'. [RegexpSingleline] BUILD FAILED /srv/gump/public/workspace/tomcat-8.5.x/build.xml:558: Got 1 errors and 0 warnings. Total time: 22 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-validate/rss.xml - Atom: http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 2019032807, vmgump-vm3.apache.org:vmgump:2019032807 Gump E-mail Identifier (unique within run) #6. -- Apache Gump http://gump.apache.org/ [Instance: vmgump-vm3] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: ws police
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 The following commit(s) were added to refs/heads/master by this push: new 70b7a4b ws police 70b7a4b is described below commit 70b7a4ba90085745323c64706dc043c1664ab703 Author: Mark Thomas AuthorDate: Wed Mar 27 22:59:44 2019 + ws police --- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index 8ebbe6f..823d9bc 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -750,7 +750,7 @@ public class Nio2Endpoint extends AbstractJsseEndpoint
[tomcat] branch master updated: Update changelog for translations
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 The following commit(s) were added to refs/heads/master by this push: new c36a122 Update changelog for translations c36a122 is described below commit c36a122ce7ca1970c45f18b95ca5ab1b911641bf Author: Mark Thomas AuthorDate: Wed Mar 27 22:58:44 2019 + Update changelog for translations --- webapps/docs/changelog.xml | 34 ++ 1 file changed, 34 insertions(+) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d5a53fa..7056fb3 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -150,6 +150,40 @@ Update to the Eclipse JDT compiler 4.10. (markt) + +Expand the coverage and quality of the Spanish translations provided +with Apache Tomcat. Includes contributions by Ulises Gonzalez Horta. +(markt) + + +Expand the coverage and quality of the Czech translations provided +with Apache Tomcat. Includes contributions by Arnošt Havelka. (markt) + + +Expand the coverage and quality of the Chinese translations provided +with Apache Tomcat. Includes contributions by winsonzhao and wjt. +(markt) + + +Expand the coverage and quality of the Russian translations provided +with Apache Tomcat. (kkolinko) + + +Expand the coverage and quality of the Japanese translations provided +with Apache Tomcat. (kfujino) + + +Expand the coverage and quality of the Korean translations provided +with Apache Tomcat. (woonsan) + + +Expand the coverage and quality of the German translations provided +with Apache Tomcat. (fschumacher) + + +Expand the coverage and quality of the French translations provided +with Apache Tomcat. (remm) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (4edcbe8 -> 31e7a44)
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 4edcbe8 Cleanups new dc9bd3b Update French translation new 1cd4e91 Update Czech translations new 85fe1e1 Update German translations new e5700e9 Update Korean translations new 31e7a44 Update Chinese translations The 20679 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: java/org/apache/catalina/authenticator/LocalStrings_de.properties | 2 ++ java/org/apache/catalina/connector/LocalStrings_ko.properties | 2 ++ java/org/apache/catalina/core/LocalStrings_de.properties| 2 ++ java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 2 ++ java/org/apache/catalina/filters/LocalStrings_de.properties | 1 + java/org/apache/catalina/ha/session/LocalStrings_de.properties | 1 + java/org/apache/catalina/loader/LocalStrings_cs.properties | 2 ++ java/org/apache/catalina/manager/LocalStrings_cs.properties | 1 + java/org/apache/catalina/manager/LocalStrings_de.properties | 1 + java/org/apache/catalina/manager/host/LocalStrings_cs.properties| 1 + java/org/apache/catalina/startup/LocalStrings_cs.properties | 1 + java/org/apache/catalina/startup/LocalStrings_zh_CN.properties | 1 + .../apache/catalina/tribes/membership/LocalStrings_cs.properties| 1 + .../catalina/tribes/transport/nio/LocalStrings_zh_CN.properties | 2 ++ java/org/apache/catalina/webresources/LocalStrings_cs.properties| 2 ++ java/org/apache/coyote/http11/LocalStrings_de.properties| 1 + java/org/apache/coyote/http11/LocalStrings_zh_CN.properties | 2 +- java/org/apache/coyote/http2/LocalStrings_fr.properties | 2 +- java/org/apache/jasper/resources/LocalStrings_cs.properties | 1 + java/org/apache/jasper/resources/LocalStrings_de.properties | 6 +- java/org/apache/jasper/resources/LocalStrings_zh_CN.properties | 1 + java/org/apache/tomcat/util/digester/LocalStrings_zh_CN.properties | 1 + java/org/apache/tomcat/util/http/LocalStrings_zh_CN.properties | 1 + .../apache/tomcat/util/net/openssl/LocalStrings_zh_CN.properties| 2 +- java/org/apache/tomcat/websocket/LocalStrings_cs.properties | 1 + 25 files changed, 36 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63293] Tomcat 9.0 logging not working with log4j1.2 after upgraded from Tomcat 8.0
https://bz.apache.org/bugzilla/show_bug.cgi?id=63293 --- Comment #4 from twsatw...@gmail.com --- (In reply to Konstantin Kolinko from comment #3) > Apache Log4j 1.x has officially reached End of Life. > > Tomcat 9.0 has no support for it (since Tomcat 9.0.0.M7, see changelog). > > The rest is a topic for the mailing list (don't forget to search the > archives). Konstantin, Thank you very much for the prompt clarification and kind direction to the relevant information in Tomcat 9.0 changelog. As for the my own reference, the detailed info may be found at the link: https://tomcat.apache.org/tomcat-9.0-doc/changelog.html See the sections Catalina and Extras under Tomcat 9.0.0.M7. Thanks again. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Cleanups
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new a1dc9b0 Cleanups
a1dc9b0 is described below
commit a1dc9b09305705f3bdd29504f7d5c8d2b76bd45f
Author: remm
AuthorDate: Wed Mar 27 22:42:41 2019 +0100
Cleanups
---
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index c38dc70..0432198 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -701,22 +701,22 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
@Override
public boolean isReadyForRead() throws IOException {
synchronized (readCompletionHandler) {
+// A notification has been sent, it is possible to read at
least once
if (readNotify) {
return true;
}
-
+// If a read is pending, reading is not possible until a
notification is sent
if (!readPending.tryAcquire()) {
readInterest = true;
return false;
}
-
+// It is possible to read directly from the buffer contents
if (!socketBufferHandler.isReadBufferEmpty()) {
readPending.release();
return true;
}
-
-int nRead = fillReadBuffer(false);
-boolean isReady = nRead > 0;
+// Try to read some data
+boolean isReady = fillReadBuffer(false) > 0;
if (!isReady) {
readInterest = true;
}
@@ -728,20 +728,21 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
@Override
public boolean isReadyForWrite() {
synchronized (writeCompletionHandler) {
+// A notification has been sent, it is possible to write at
least once
if (writeNotify) {
return true;
}
-
+// If a write is pending, writing is not possible until a
notification is sent
if (!writePending.tryAcquire()) {
writeInterest = true;
return false;
}
-
+// If the buffer is empty, it is possible to write to it
if (socketBufferHandler.isWriteBufferEmpty() &&
nonBlockingWriteBuffer.isEmpty()) {
writePending.release();
return true;
}
-
+// Try to flush all data
boolean isReady = !flushNonBlockingInternal(true);
if (!isReady) {
writeInterest = true;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Cleanups
This is an automated email from the ASF dual-hosted git repository.
remm 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 4edcbe8 Cleanups
4edcbe8 is described below
commit 4edcbe8be12a8014ce9bf0d8b0558df4caa443d7
Author: remm
AuthorDate: Wed Mar 27 22:38:47 2019 +0100
Cleanups
Add some comments. Remove dead method override in HTTP/2.
---
.../apache/coyote/http2/Http2AsyncUpgradeHandler.java | 7 ---
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 17 +
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 15098f0..91bd857 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -264,13 +264,6 @@ public class Http2AsyncUpgradeHandler extends
Http2UpgradeHandler {
}
@Override
-protected void processWrites() throws IOException {
-if (socketWrapper.isWritePending()) {
-socketWrapper.registerWriteInterest();
-}
-}
-
-@Override
protected SendfileState processSendfile(SendfileData sendfile) {
if (sendfile != null) {
try {
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index b27ca4e..8ebbe6f 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -714,22 +714,22 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint 0;
+// Try to read some data
+boolean isReady = fillReadBuffer(false) > 0;
if (!isReady) {
readInterest = true;
}
@@ -741,20 +741,21 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint
[Bug 63293] Tomcat 9.0 logging not working with log4j1.2 after upgraded from Tomcat 8.0
https://bz.apache.org/bugzilla/show_bug.cgi?id=63293 --- Comment #3 from Konstantin Kolinko --- Apache Log4j 1.x has officially reached End of Life. Tomcat 9.0 has no support for it (since Tomcat 9.0.0.M7, see changelog). The rest is a topic for the mailing list (don't forget to search the archives). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63293] Tomcat 9.0 logging not working with log4j1.2 after upgraded from Tomcat 8.0
https://bz.apache.org/bugzilla/show_bug.cgi?id=63293 --- Comment #2 from twsatw...@gmail.com --- Mark, Thanks for the quick review. However, I didn't ask how to use log4j1.2 with Tomcat. I have it working properly with Tomcat 6.0/7.0/8.0. Now, I tried to upgrade to Tomcat 9.0 and the same logging setup no longer works. There is no change in any of the code or configuration on my part, the only difference is Tomcat image- from 8.0 to 9.0. Therefore, would it be natural to look into what may change in Tomcat 9.0 in this case? I understand that things may change in a major upgrade between releases. But I'd expect the important changes would be noted in the release notes and/or migration guide. I checked Tomcat online documentation and didn't find any reference that log4j1.2 can't be used with Tomcat 9.0. I also looked up the bug list and didn't find anything before submitting this report. I attempted to dig it further in Tomcat source code but couldn't get too far. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63293] Tomcat 9.0 logging not working with log4j1.2 after upgraded from Tomcat 8.0
https://bz.apache.org/bugzilla/show_bug.cgi?id=63293 Mark Thomas changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Mark Thomas --- Bugzilla is not a support forum. Please use the users mailing list. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat Site Redesign
I have replied to Chris' email but will address here the rest of the points: On Mon, Mar 25, 2019 at 2:41 PM Konstantin Kolinko wrote: > Sorry that it takes so long, but I am rather overwhelmed nowadays, and > I need to set priorities... > Goes without saying and totally understandable. > > сб, 9 мар. 2019 г. в 00:15, Igal @ Lucee.org : > > > > All, > > > > On 3/7/2019 3:22 AM, Konstantin Kolinko wrote: > > > > > пн, 4 мар. 2019 г. в 09:02, Igal Sapir : > > >> I have uploaded the Tomcat site redesign to a temporary location for > review: > > >> http://people.apache.org/~isapir/mockups/tomcat-site/ > > > 1. Overall: Thank you for your effort, but I do not like it. At all. > > > > The effort to redesign the website was prompted by conversations with > > team members at TomcatCon in Montreal. > > OK, but what are the specific issues that were raised? > > (There is a rule at ASF is that "if it did not happen on a mailing > list, it did not happen". It means that offline discussions are OK, > but there needs to be some written summary.) > The only issue raised in the conversation was that the site has an older design and requires modernization. The rest was done here in the mailing list, though I could have made it clearer and mentioned that conversation. > > > Fair enough, but I wish you had expressed that two months ago when we > were > > going over the layout: > > https://www.mail-archive.com/dev@tomcat.apache.org/msg130453.html > > > > [,,,] > > > > I had to work with the constraints of ASF guidelines. There is a longer > > discussion about this in the thread mentioned above. > > Is there an ASF Guidelines document? > > (Maybe you have a link? There might be such document, but I do not > remember seeing it. I though that the previous thread had a link, but > I have not found such link there. A whimsy tool was mentioned, but the > tool checks for required contents. It is not about style guidelines. > What am I missing?) > https://whimsy.apache.org/site/ > It's not about the style per-se, but the fact that the required elements should be prominent, e.g. the ASF logo should be at the top, etc. I am only aware of what was mentioned in the other thread with the whimsy tool that you cited. > > If there is consensus in the team for keeping the layout with a vertical > > menu on the left then I can redesign that. > > I guess the same design will be later used for the Tomcat > Documentation web application, > http://tomcat.apache.org/tomcat-9.0-doc/index.html > > My main concern is that the documentation is printable and is easy to > use as a reference document. > > 1) Not being able to print is a show-stopper. (Really.) Anything else > is just a personal preference. > Agreed, and can be fixed as discussed in Chris' reply. > > 2) Left-side menu allows to navigate to a needed page with a single > click. I really like this feature of this menu. > > > It utilizes the Bootstrap 4 framework and is very trendy. > > One announcement that made a big impression for me in year 2018 was this > one: > https://twitter.com/mislav/status/1022058279000842240 > "We’re finally finished removing jQuery from http://GitHub.com frontend" > [...] > > Regarding concerns raised in a subsequent thread on this topic > "Tomcat Website Redesign" thread > https://www.mail-archive.com/dev@tomcat.apache.org/msg132281.html > > > a) Do nothing, i.e. keep the website as-is [1] for now > > > > [...] > > IMO option (a) is not good because the site is very outdated and not > mobile friendly. Many users nowadays view sites on their phones and/or > > tablets, which a modern design can address. > > The current site was redesigned several years ago. (See the log > history of "/xdocs/stylesheets/tomcat-site.xsl" file) I think it > should be mobile-friendly. > > What are the specific issues? > I made the navbar mobile-friendly but tables, images, font sizes, etc. are still not. It is also harder to make further improvements on top of the old design. Modernizing the site will allow for future improvements. I believe that the rest of the items on this email were addressed in Chris' reply and my reply to it. Best, Igal
Re: Tomcat Site Redesign
On Tue, Mar 26, 2019 at 6:12 PM Christopher Schultz <
ch...@christopherschultz.net> wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> Konstantin,
>
> On 3/25/19 17:41, Konstantin Kolinko wrote:
> > My main concern is that the documentation is printable and is easy
> > to use as a reference document.
> >
> > 1) Not being able to print is a show-stopper. (Really.) Anything
> > else is just a personal preference.
>
> @media print {
> ...
> }
>
> Ought to be able to handle any changes required for print media. The
> menus never have to print. Never. Because they will never be navigable
> on paper. So they can just be removed. Horizontal, vertical, 3D,
> zooming, it doesn't matter. Just remove them when then are printed and
> it's not an issue.
>
> The main body of the content is still a wall of text from top to
> bottom. That should render just fine on a printer on in PDF.
>
Right. We can fix the printing and it can be rendered differently from the
screen as Chris pointed out, so that's definitely fixable. I absolutely
agree that Print is an important function.
>
> > 2) Left-side menu allows to navigate to a needed page with a
> > single click. I really like this feature of this menu.
>
> Unless you scroll too far down the page. I've always been irritated
> about this "feature" of the Tomcat documentation. Once you scroll away
> from the menu, it's no longer "one click away". So if it could "stick"
> to the top of the window (horizontal) or never scroll completely off
> the top of the page, that would be a nice improvement.
>
The current proposal has a sticky navbar at the top so that is already
implemented, unless I misunderstood something.
>
> >> It utilizes the Bootstrap 4 framework and is very trendy.
> >
> > One announcement that made a big impression for me in year 2018 was
> > this one: https://twitter.com/mislav/status/1022058279000842240
> > "We’re finally finished removing jQuery from http://GitHub.com
> > frontend" [...]
>
> IMO we should avoid javascript at all costs. Almost everything worth
> doing can currently be done with CSS.
>
> Bootstrap can use jQuery, but it doesn't have to.
>
We can replace jQuery with newer JavaScript constructs as browsers nowadays
conform to standards much better than they did a decade ago. jQuery simply
makes it easier to develop.
I'm not sure that we want to avoid JS altogether though. For example, the
font-size widget that I added relies on JS. The current site also has some
JS code.
>
> > Regarding concerns raised in a subsequent thread on this topic
> > "Tomcat Website Redesign" thread
> > https://www.mail-archive.com/dev@tomcat.apache.org/msg132281.html
> >
> >> a) Do nothing, i.e. keep the website as-is [1] for now
> >>
> >> [...] IMO option (a) is not good because the site is very
> >> outdated and not mobile friendly. Many users nowadays view sites
> >> on their phones and/or tablets, which a modern design can
> >> address.
> >
> > The current site was redesigned several years ago. (See the log
> > history of "/xdocs/stylesheets/tomcat-site.xsl" file) I think it
> > should be mobile-friendly.
> >
> > What are the specific issues?
> >
> > Is it possible to make changes in small incremental reversible
> > steps?
>
> IMO, this *was* fairly incremental.
>
IMO as well. The first update was done a while ago when I made the navbar
on the left "responsive" for the current site. We can continue the
incremental way only if stick to a vertical navbar. The horizontal navbar
requires too many changes to the structure of the HTML.
The problem with going the incremental way, though, is that it continues as
a patch work so it creates inefficient spaghetti code which is much harder
to refactor since we don't have the tooling that Java provides, for example.
Igal
[Bug 63293] Tomcat 9.0 logging not working with log4j1.2 after upgraded from Tomcat 8.0
https://bz.apache.org/bugzilla/show_bug.cgi?id=63293 twsatw...@gmail.com changed: What|Removed |Added CC||twsatw...@gmail.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63293] New: Tomcat 9.0 logging not working with log4j1.2 after upgraded from Tomcat 8.0
https://bz.apache.org/bugzilla/show_bug.cgi?id=63293
Bug ID: 63293
Summary: Tomcat 9.0 logging not working with log4j1.2 after
upgraded from Tomcat 8.0
Product: Tomcat 9
Version: 9.0.13
Hardware: PC
OS: All
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: twsatw...@gmail.com
Target Milestone: -
Created attachment 36500
--> https://bz.apache.org/bugzilla/attachment.cgi?id=36500=edit
This archive contains log4j configuration and sample Tomcat server.log files.
[Title]
Tomcat 9.0 logging not working with log4j1.2 after upgraded from Tomcat 8.0
[Frequency of Occurrence]
Always
[System/Software Info]
OS: Red Hat Enterprise Linux Server release 7.6 (Maipo)
Tomcat: 8.0.52 and 9.0.13
Tomcat Native: 1.2.17
Tomcat APR: 1.6.3
OpenSSL: 1.0.2o
OpenJDK (JRE): 1.8.0-171-b11
[Details]
1. log4j 1.2.15 is used as the logging library with Tomcat.
2. A custom log4j configuration is used (see the attached "log4j.properties").
(1) log4j rootLogger is set to INFO, FILE
(2) The FILE appender is set to ${catalina.base}/logs/server.log
3. The same environment is used to run Tomcat. The only difference before and
after the Tomcat upgrade is Tomcat itself.
(Note there exists change in FormAuthenticator and the use of
LegacyCookieProcessor as the CookieProcessor for backward compatibility.)
4. When running with Tomcat 8.0.52, some INFO logs from Tomcat
(org.apache.catalina.*) appear in ${catalina.base}/logs/server.log"
5. When running with Tomcat 9.0.13, the file ${catalina.base}/logs/server.log
is basically empty.
6. Refer to the attached sample server.log files from 8.0.52 and 9.0.13.
7. I checked the source code "org.apache.catalina.core.StandardService.java" in
Tomcat 9.0.13. One logging statement in the code looks the same to me.
However, I see this log with 8.0.52 but not 9.0.13.
8. This issue is observed in 9.0.13 (and higher).
// --- code Snippet [S] ---
... ...
protected void startInternal() throws LifecycleException {
if(log.isInfoEnabled())
log.info(sm.getString("standardService.start.name", this.name));
// <--- This log appears with 8.0.52
setState(LifecycleState.STARTING);
// Start our defined Container first
if (engine != null) {
synchronized (engine) {
engine.start();
}
}
... ...
// --- code Snippet [E] ---
8. I looked up in the release notes and migration info but seem not seeing
Tomcat 9 would not work with log4j1.2.
9. The issue is also observed in Windows platform.
[Prerequisites]
1. Tomcat 8.0.52 and 9.0.13
2. OpenSSL library. See the References section.
3. APR library for Linux. See the References section.
4. Tomcat Native library for Linux (this needs to be built from the source
code. Tomcat does not include this for Linux.) See the References section.
5. Tomcat needs to be set up using APR/OpenSSL with proper certificate(s).
[Setup Steps]
1. Ensure the following files exist under ${catalina.base}\lib
(1) log4j.jar (v. 1.2.15)
(2) log4j.properties
[Procedure To Reproduce]
1. Start Tomcat 8.0.52 and check the file ${catalina.base}/logs/server.log
2. Start Tomcat 9.0.13 and check the file ${catalina.base}/logs/server.log
[References]
1. Tomcat
(1) Main: https://tomcat.apache.org/index.html
(2) 8.0.52 download: https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.52/
(3) 9.0.13 download: https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.13/
2. log4j1.2
(1) Main: https://logging.apache.org/log4j/1.2/index.html
(2) 1.2.15: Download: http://archive.apache.org/dist/logging/log4j/1.2.15/
3. Tomcat APR:
(1) Main: http://apr.apache.org/
(2) 1.6.3 download: http://archive.apache.org/dist/apr/
4. Tomcat Native
(1) Main: https://tomcat.apache.org/native-doc/
(2) 1.2.17 download:
https://archive.apache.org/dist/tomcat/tomcat-connectors/native/1.2.17/
5. OpenSSL
(1) Main: https://www.openssl.org/
(2) 1.0.2o: https://www.openssl.org/source/old/1.0.2/
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Revert to the previous revision
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 8105776 Revert to the previous revision
8105776 is described below
commit 8105776b9c4d484ea8fda8f8be8eb0f82d6c9a1f
Author: remm
AuthorDate: Wed Mar 27 18:37:09 2019 +0100
Revert to the previous revision
This was equivalent but slightly less efficient. Also cleanup the
flushNonBlocking IOE check.
---
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 29 ++-
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 27891d5..c38dc70 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -731,7 +731,22 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
if (writeNotify) {
return true;
}
-return super.isReadyForWrite();
+
+if (!writePending.tryAcquire()) {
+writeInterest = true;
+return false;
+}
+
+if (socketBufferHandler.isWriteBufferEmpty() &&
nonBlockingWriteBuffer.isEmpty()) {
+writePending.release();
+return true;
+}
+
+boolean isReady = !flushNonBlockingInternal(true);
+if (!isReady) {
+writeInterest = true;
+}
+return isReady;
}
}
@@ -1233,6 +1248,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
// indicate the end of a write
// Uses: if (writePending.tryAcquire(socketWrapper.getTimeout(),
TimeUnit.MILLISECONDS))
synchronized (writeCompletionHandler) {
+checkError();
if (writeNotify || writePending.tryAcquire()) {
// No pending completion handler, so writing to the main
buffer
// is possible
@@ -1244,7 +1260,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
// Remaining data must be buffered
nonBlockingWriteBuffer.add(buf, off, len);
}
-flushNonBlocking(true);
+flushNonBlockingInternal(true);
} else {
nonBlockingWriteBuffer.add(buf, off, len);
}
@@ -1283,6 +1299,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
// indicate the end of a write
// Uses: if (writePending.tryAcquire(socketWrapper.getTimeout(),
TimeUnit.MILLISECONDS))
synchronized (writeCompletionHandler) {
+checkError();
if (writeNotify || writePending.tryAcquire()) {
// No pending completion handler, so writing to the main
buffer
// is possible
@@ -1292,7 +1309,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
// Remaining data must be buffered
nonBlockingWriteBuffer.add(from);
}
-flushNonBlocking(true);
+flushNonBlockingInternal(true);
} else {
nonBlockingWriteBuffer.add(from);
}
@@ -1357,11 +1374,11 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
@Override
protected boolean flushNonBlocking() throws IOException {
-return flushNonBlocking(false);
+checkError();
+return flushNonBlockingInternal(false);
}
-private boolean flushNonBlocking(boolean hasPermit) throws IOException
{
-checkError();
+private boolean flushNonBlockingInternal(boolean hasPermit) {
synchronized (writeCompletionHandler) {
if (writeNotify || hasPermit || writePending.tryAcquire()) {
// The code that was notified is now writing its data
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Revert to the previous revision
This is an automated email from the ASF dual-hosted git repository. remm 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 4ee72e6 Revert to the previous revision 4ee72e6 is described below commit 4ee72e6512e7442de9c9fdfd3e17c207e42bec37 Author: remm AuthorDate: Wed Mar 27 17:50:10 2019 +0100 Revert to the previous revision This was equivalent but slightly less efficient. Also cleanup the flushNonBlocking IOE check. --- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 29 ++- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index 3397e18..b27ca4e 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -744,7 +744,22 @@ public class Nio2Endpoint extends AbstractJsseEndpoint
[tomcat] branch 8.5.x updated: Fix ALPN negotiation with JSSE
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new bcca085 Fix ALPN negotiation with JSSE
bcca085 is described below
commit bcca085c20f8a00c5ade95ca7c45c90a4d274f8c
Author: Mark Thomas
AuthorDate: Wed Mar 27 15:35:33 2019 +
Fix ALPN negotiation with JSSE
When using a JSSE TLS connector that supported ALPN (Java 9 onwards) and
a protocol was not negotiated, Tomcat failed to fallback to HTTP/1.1 and
instead dropped the connection.
---
java/org/apache/coyote/AbstractProtocol.java | 4 +++-
webapps/docs/changelog.xml | 5 +
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index fc899df..837f805 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -749,7 +749,9 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
try {
if (processor == null) {
String negotiatedProtocol =
wrapper.getNegotiatedProtocol();
-if (negotiatedProtocol != null) {
+// OpenSSL typically returns null whereas JSSE typically
+// returns "" when no protocol is negotiated
+if (negotiatedProtocol != null &&
negotiatedProtocol.length() > 0) {
UpgradeProtocol upgradeProtocol =
getProtocol().getNegotiatedProtocol(negotiatedProtocol);
if (upgradeProtocol != null) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fc04dd7..b482e9c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -93,6 +93,11 @@
Harmonize NIO2 isReadyForWrite with isReadyForRead code. (remm)
+
+When using a JSSE TLS connector that supported ALPN (Java 9 onwards)
and
+a protocol was not negotiated, Tomcat failed to fallback to HTTP/1.1
and
+instead dropped the connection. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Fix ALPN negotiation with JSSE
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
The following commit(s) were added to refs/heads/master by this push:
new a938b51 Fix ALPN negotiation with JSSE
a938b51 is described below
commit a938b5118c9ee7aa69c66cc2f0b6d7ff1122d2be
Author: Mark Thomas
AuthorDate: Wed Mar 27 15:35:33 2019 +
Fix ALPN negotiation with JSSE
When using a JSSE TLS connector that supported ALPN (Java 9 onwards) and
a protocol was not negotiated, Tomcat failed to fallback to HTTP/1.1 and
instead dropped the connection.
---
java/org/apache/coyote/AbstractProtocol.java | 4 +++-
webapps/docs/changelog.xml | 5 +
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index 6b9dbea..51bdb3b 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -777,7 +777,9 @@ public abstract class AbstractProtocol implements
ProtocolHandler,
try {
if (processor == null) {
String negotiatedProtocol =
wrapper.getNegotiatedProtocol();
-if (negotiatedProtocol != null) {
+// OpenSSL typically returns null whereas JSSE typically
+// returns "" when no protocol is negotiated
+if (negotiatedProtocol != null &&
negotiatedProtocol.length() > 0) {
UpgradeProtocol upgradeProtocol =
getProtocol().getNegotiatedProtocol(negotiatedProtocol);
if (upgradeProtocol != null) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fd00294..d5a53fa 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,6 +104,11 @@
Harmonize NIO2 isReadyForWrite with isReadyForRead code. (remm)
+
+When using a JSSE TLS connector that supported ALPN (Java 9 onwards)
and
+a protocol was not negotiated, Tomcat failed to fallback to HTTP/1.1
and
+instead dropped the connection. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in on tomcat-trunk
On Wed, Mar 27, 2019 at 11:42 AM wrote: > The Buildbot has detected a new failure on builder tomcat-trunk while > building tomcat. Full details are available at: > https://ci.apache.org/builders/tomcat-trunk/builds/4165 > > Buildbot URL: https://ci.apache.org/ > > Buildslave for this Build: silvanus_ubuntu > > Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' > triggered this build > Build Source Stamp: [branch master] > 950b940c6abdc1b674278c59c6bd6672a23120ea > Blamelist: remm > > BUILD FAILED: failed compile_1 > https://ci.apache.org/projects/tomcat/tomcat9/logs/4165/TEST-org.apache.coyote.http2.TestAsync.NIO2.txt I haven't seen this failure scenario before, the content is ok, but the last closing frame was a connection error rather than the end of stream. Maybe a race on close of some sort. Rémy > > Sincerely, > -The Buildbot > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4166 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 085c04124f7764053a88441f5afc36c4465e074c Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Simply use the superclass rather than a real flush here
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 4e5344e Simply use the superclass rather than a real flush here
4e5344e is described below
commit 4e5344eb1acc71219d16d87c88f32d38985f5630
Author: remm
AuthorDate: Wed Mar 27 13:37:51 2019 +0100
Simply use the superclass rather than a real flush here
---
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 24 +--
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 9182aec..27891d5 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -731,29 +731,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
if (writeNotify) {
return true;
}
-
-if (!writePending.tryAcquire()) {
-writeInterest = true;
-return false;
-}
-
-if (socketBufferHandler.isWriteBufferEmpty() &&
nonBlockingWriteBuffer.isEmpty()) {
-writePending.release();
-return true;
-}
-
-boolean dataLeft = false;
-try {
-dataLeft = flushNonBlocking(true);
-} catch (IOException e) {
-setError(e);
-return true;
-}
-boolean isReady = !dataLeft;
-if (!isReady) {
-writeInterest = true;
-}
-return isReady;
+return super.isReadyForWrite();
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Simply use the superclass rather than a real flush here
This is an automated email from the ASF dual-hosted git repository. remm 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 085c041 Simply use the superclass rather than a real flush here 085c041 is described below commit 085c04124f7764053a88441f5afc36c4465e074c Author: remm AuthorDate: Wed Mar 27 12:51:38 2019 +0100 Simply use the superclass rather than a real flush here --- java/org/apache/tomcat/util/net/Nio2Endpoint.java | 24 +-- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index 711f777..3397e18 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -744,29 +744,7 @@ public class Nio2Endpoint extends AbstractJsseEndpoint
buildbot success in on tomcat-85-trunk
The Buildbot has detected a restored build on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/1718 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 38dc12b640dec45037b000c9af48738483553302 Blamelist: remm Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4165 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 950b940c6abdc1b674278c59c6bd6672a23120ea Blamelist: remm BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Harmonize NIO2 isReadyForWrite with isReadyForRead code
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 38dc12b Harmonize NIO2 isReadyForWrite with isReadyForRead code
38dc12b is described below
commit 38dc12b640dec45037b000c9af48738483553302
Author: remm
AuthorDate: Wed Mar 27 11:35:49 2019 +0100
Harmonize NIO2 isReadyForWrite with isReadyForRead code
Following 8.5 #1717, it is better to redo it with sync as it seems to
indicate a leftover write issue.
Also add cleanups.
---
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 121 ++---
.../apache/tomcat/util/net/SocketWrapperBase.java | 2 +
webapps/docs/changelog.xml | 3 +
3 files changed, 84 insertions(+), 42 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 992063f..9182aec 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -111,6 +111,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
// - Public Methods
+
/**
* Number of keep-alive sockets.
*
@@ -132,7 +133,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
public void bind() throws Exception {
// Create worker collection
-if ( getExecutor() == null ) {
+if (getExecutor() == null) {
createExecutor();
}
if (getExecutor() instanceof ExecutorService) {
@@ -146,7 +147,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
serverSock = AsynchronousServerSocketChannel.open(threadGroup);
socketProperties.setProperties(serverSock);
InetSocketAddress addr = (getAddress()!=null?new
InetSocketAddress(getAddress(),getPort()):new InetSocketAddress(getPort()));
-serverSock.bind(addr,getAcceptCount());
+serverSock.bind(addr, getAcceptCount());
// Initialize thread count defaults for acceptor, poller
if (acceptorThreadCount != 1) {
@@ -339,12 +340,12 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
protected SocketProcessorBase createSocketProcessor(
SocketWrapperBase socketWrapper, SocketEvent event) {
return new SocketProcessor(socketWrapper, event);
-}
+}
@Override
protected Log getLog() {
return log;
-}
+}
@Override
@@ -715,9 +716,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
}
int nRead = fillReadBuffer(false);
-
boolean isReady = nRead > 0;
-
if (!isReady) {
readInterest = true;
}
@@ -727,6 +726,39 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
@Override
+public boolean isReadyForWrite() {
+synchronized (writeCompletionHandler) {
+if (writeNotify) {
+return true;
+}
+
+if (!writePending.tryAcquire()) {
+writeInterest = true;
+return false;
+}
+
+if (socketBufferHandler.isWriteBufferEmpty() &&
nonBlockingWriteBuffer.isEmpty()) {
+writePending.release();
+return true;
+}
+
+boolean dataLeft = false;
+try {
+dataLeft = flushNonBlocking(true);
+} catch (IOException e) {
+setError(e);
+return true;
+}
+boolean isReady = !dataLeft;
+if (!isReady) {
+writeInterest = true;
+}
+return isReady;
+}
+}
+
+
+@Override
public int read(boolean block, byte[] b, int off, int len) throws
IOException {
checkError();
@@ -847,7 +879,6 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
readInterest = true;
}
}
-
return nRead;
}
}
@@ -903,7 +934,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
@Override
public boolean hasAsyncIO() {
-return false;
+return true;
}
/**
@@ -1387,9 +1418,8 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint {
@Override
public boolean hasDataToRead() {
synchronized (readCompletionHandler) {
-return !socketBufferHandler.isReadBufferEmpty() ||
-readNotify ||
-getError() != null;
+return
[tomcat] branch master updated: Harmonize NIO2 isReadyForWrite with isReadyForRead code
This is an automated email from the ASF dual-hosted git repository.
remm 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 950b940 Harmonize NIO2 isReadyForWrite with isReadyForRead code
950b940 is described below
commit 950b940c6abdc1b674278c59c6bd6672a23120ea
Author: remm
AuthorDate: Wed Mar 27 11:15:59 2019 +0100
Harmonize NIO2 isReadyForWrite with isReadyForRead code
Following 8.5 #1717, it is better to redo it with sync as it seems to
indicate a leftover write issue.
---
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 35 +--
webapps/docs/changelog.xml| 3 ++
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 0028edb..711f777 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -729,9 +729,7 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint 0;
-
if (!isReady) {
readInterest = true;
}
@@ -741,6 +739,39 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint
+
+Harmonize NIO2 isReadyForWrite with isReadyForRead code. (remm)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] paplorinc commented on a change in pull request #143: Apply deduplication to certain loaded and created Strings
paplorinc commented on a change in pull request #143: Apply deduplication to
certain loaded and created Strings
URL: https://github.com/apache/tomcat/pull/143#discussion_r269449223
##
File path: java/org/apache/tomcat/util/digester/SetPropertiesRule.java
##
@@ -62,7 +59,7 @@ public void begin(String namespace, String theName,
Attributes attributes)
if ("".equals(name)) {
name = attributes.getQName(i);
}
-String value = attributes.getValue(i);
+String value = attributes.getValue(i).intern();
Review comment:
FYI: https://shipilev.net/jvm/anatomy-quarks/10-string-intern
> In almost every project we were taking care of, removing String.intern()
from the hotpaths, or optionally replacing it with a handrolled deduplicator,
was the very profitable performance optimization. Do not use String.intern()
without thinking very hard about it, okay?
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
