svn commit: r1804094 - in /tomcat/trunk: java/org/apache/catalina/valves/ErrorReportValve.java webapps/docs/changelog.xml
Author: markt
Date: Fri Aug 4 11:01:28 2017
New Revision: 1804094
URL: http://svn.apache.org/viewvc?rev=1804094&view=rev
Log:
Before generating an error page in the ErrorReportValve, check to see if I/O is
still permitted for the associated connection before generating the error page
so that the page generation can be skipped if the page is never going to be
sent.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1804094&r1=1804093&r2=1804094&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Fri Aug
4 11:01:28 2017
@@ -19,6 +19,7 @@ package org.apache.catalina.valves;
import java.io.IOException;
import java.io.Writer;
import java.util.Scanner;
+import java.util.concurrent.atomic.AtomicBoolean;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
@@ -149,6 +150,15 @@ public class ErrorReportValve extends Va
if (statusCode < 400 || response.getContentWritten() > 0 ||
!response.setErrorReported()) {
return;
}
+
+// If an error has occurred that prevents further I/O, don't waste time
+// producing an error report that will never be read
+AtomicBoolean result = new AtomicBoolean(false);
+response.getCoyoteResponse().action(ActionCode.IS_IO_ALLOWED, result);
+if (!result.get()) {
+return;
+}
+
String message = RequestUtil.filter(response.getMessage());
if (message == null) {
if (throwable != null) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1804094&r1=1804093&r2=1804094&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 4 11:01:28 2017
@@ -45,6 +45,16 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+Before generating an error page in the ErrorReportValve,
+check to see if I/O is still permitted for the associated connection
+before generating the error page so that the page generation can be
+skipped if the page is never going to be sent. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1804095 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/ErrorReportValve.java webapps/docs/changelog.xml
Author: markt Date: Fri Aug 4 11:02:13 2017 New Revision: 1804095 URL: http://svn.apache.org/viewvc?rev=1804095&view=rev Log: Before generating an error page in the ErrorReportValve, check to see if I/O is still permitted for the associated connection before generating the error page so that the page generation can be skipped if the page is never going to be sent. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 4 11:02:13 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-
Re: Opportunities for cohesion improvement and refatoring
Hi Christopher thank you for the comment. Sorry I did not understand. What do you mean by Fluent? 2017-08-02 17:41 GMT-03:00 Christopher Schultz : > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Mark and João, > > On 8/2/17 3:38 AM, Mark Thomas wrote: > > On 02/08/2017 00:02, João Paulo Lemes Machado wrote: > >> Hi Mark. > >> > >> Did you take a look at my suggestion? > > > > Yes. I don't think the cost is worth the benefit. > > +1 > > So what if the class has 61 properties? If you divide it into a "doer" > class and a "configurator" class, you'll have two classes, one of > which has 61 properties and the other of which can't do anything > without /yet another/ object being available to configure it. > > Then again, you're talking to someone who thinks Fluent is an abominatio > n. > > - -chris > > >> 2017-07-25 15:33 GMT-03:00 João Paulo Lemes Machado > >> : > >> > >>> Hi Mark, tanks for the comment. > >>> > >>> Let me take the DataSourceProxy as example. > >>> > >>> This class has 142 methods of which 112 are get () and set () > >>> methods. We could mark these methods as deprecated and copy > >>> them to a new class: DataSourceProxyConfig, but we would leave > >>> them in the DataSourceProxy class, and they would be removed > >>> gradually. > >>> > >>> Those parameters and methods would be accessed by an instance > >>> variable of DataSourceProxyConfig in DataSourceProxy. > >>> > >>> So we will keep the methods in the original class for some time > >>> so that developers who have some assumption about the class can > >>> adapt. > >>> > >>> However, when choosing the methods we could analyze their > >>> complexity. If it is a simple set () or get () that only sets > >>> or returns a value it would be prioritized. > >>> > >>> > >>> > >>> Methods that have a greater complexity, or that make calls to > >>> other methods would not be extracted at first. > >>> > >>> > >>> And if for some reason we can not make these changes (remove > >>> the methods), this strategy can be adopted to prevent these > >>> classes from growing even more. It can also be adopted as a new > >>> practice for creating new classes in the future. > >>> > >>> > >>> What do you think? > >>> > >>> > >>> > >>> > >>> > >>> 2017-07-25 10:40 GMT-03:00 Mark Thomas : > >>> > On 25/07/17 13:55, João Paulo Lemes Machado wrote: > > Hello everyone. > > > > My name is João Paulo, I am a graduate student the Federal > > University of Uberlandia, Brazil. > > > > I was analyzing the modularization of some classes of > > Tomcat, and I identified some opportunities for cohesion > > improvement in the following classes: > > > > DataSourceProxy ConnectionPool BasicDataSource > > DelegatingCallableStatement PoolProperties > > PoolConfiguration > > Those look to be from a mix of implementations (Commons DBCP > and Tomcat's jdbc-pool). > > This is the place to discuss changes to Tomcat's jdbc-pool. > DBCP changes should be discussed on the Apache Commons dev > mailing list. > > > Could you please take a look and tell me if it's viable? > > Hard to comment without a concrete example. > > > Maybe some of these classes could benefit from some kind of > > refactoring that we can discuss. > > Maybe. What did you have in mind? > > Mark > > --- > - -- > > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > >>> > >> > > > > > > - > > > > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > -BEGIN PGP SIGNATURE- > Comment: GPGTools - http://gpgtools.org > Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ > > iQIcBAEBCAAGBQJZgjjcAAoJEBzwKT+lPKRYtxEQAMBZIOujH7GHCP77aOe+D9cY > zHmTKfeppTzxD6fCpXFmfnhMLZg7aCf7zHXR/PtMcrwZvyqJdRSOqlBr2LpENx7a > xpJfNUnGZ2FPdfkxXsC12ZO0fs/jya+rIrQRo9F0uVJ6AY11gN9y1piuyZv07A/1 > oct/MwXasapAU3OgiDW02HIGYgTHScKrY4GflgbQHH85JnyMJw094y3TX5zxX3M+ > er700ht4EL4+W3hZKmS/sE8gss1BCjvV1mzzq0Gs09YFNBaaoM4WWwKks4Euf0pX > saJQY5q/UjJNqE97utUS00qXtVLUeW6h6DMn7Yup/QvX7iRzkR411hHvhvdulM1E > cKH1U3uCqZsV3O3db/9DExzpZGRSoDEPrAc1rRl7zkJW8uj8bXFhYxaeoXvhajQ8 > 27FuT8ikJe1CGQTw48hXrHRrBBXq4M7j5OkB6b6TFk2tTiI+1m3jtOhZj360lt2H > c6nJYo8tFoBPmOp3APgPa0lTpNoaV9oT1/GQx+/qAm6CwUBOxekzTT8cJ+ZhvZm1 > WLY3W1tFvQo+Jw5fYCRjPgres5EUMKzZgCr8Stqtl0oTx5RwnaxJDMbZikdtWp2D > 0dga4ezp/D1SrgmVkzUt0ihP9olNa1wkBhkwxsDWPUPlnlfXuRU8dP1CPsIw91rY > j5asNhZy8x6PgLNUzHfT > =Ar0Z > -END PGP SIGNATURE- > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
[Bug 60555] run by ssl and port:443 close_wait
https://bz.apache.org/bugzilla/show_bug.cgi?id=60555 --- Comment #4 from Vaibhav Bhandari --- @hiki's comments seems right and thats why a port to 7.0 line would be needed. We have hit this issue in 7.0 tomcat version. -- 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 60035] java.io.IOException: Too many open files
https://bz.apache.org/bugzilla/show_bug.cgi?id=60035 --- Comment #12 from Vaibhav Bhandari --- (In reply to Mark Thomas from comment #7) > This has been fixed in the following branches: > - 9.0.x for 9.0.0.M10 onwards > - 8.5.x for 8.5.5 onwards > > 8.0.x and earlier were not affected. As mentioned in https://bz.apache.org/bugzilla/show_bug.cgi?id=60555#c4 this bug effects the 7.0 line as well. Can you please check and confirm based on @hiki's comments in 60555. -- 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 60555] run by ssl and port:443 close_wait
https://bz.apache.org/bugzilla/show_bug.cgi?id=60555 Vaibhav Bhandari changed: What|Removed |Added CC||vbhand...@vmware.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 60035] java.io.IOException: Too many open files
https://bz.apache.org/bugzilla/show_bug.cgi?id=60035 Vaibhav Bhandari changed: What|Removed |Added CC||vbhand...@vmware.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
