hello
Hi, I have a series of spelling fixes for Apache Tomcat [1]. If someone could suggest a preferred way to receive them, I'm happy to split them up. Some changes are more interesting than others (the change to KEYS is interesting). [1] https://github.com/jsoref/tomcat/commits/spelling - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: hello
Hi, 2017-01-09 10:51 GMT+02:00 Josh Soref : > > Hi, > I have a series of spelling fixes for Apache Tomcat [1]. > > If someone could suggest a preferred way to receive them, I'm happy to > split them up. > > Some changes are more interesting than others (the change to KEYS is > interesting). > > [1] https://github.com/jsoref/tomcat/commits/spelling I'll take a look. Regards, Violeta > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
Re: hello
On 09/01/2017 08:51, Josh Soref wrote: > Hi, > I have a series of spelling fixes for Apache Tomcat [1]. > > If someone could suggest a preferred way to receive them, I'm happy to > split them up. Pull request or patch file attached to a new Bugzilla issue is fine. Mark > > Some changes are more interesting than others (the change to KEYS is > interesting). > > [1] https://github.com/jsoref/tomcat/commits/spelling > > - > 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
Re: hello
Hi Josh, 2017-01-09 11:11 GMT+02:00 Mark Thomas : > > On 09/01/2017 08:51, Josh Soref wrote: > > Hi, > > I have a series of spelling fixes for Apache Tomcat [1]. > > > > If someone could suggest a preferred way to receive them, I'm happy to > > split them up. > > Pull request or patch file attached to a new Bugzilla issue is fine. I saw that you have separate changes for every spelling fix. May be it is better to squash them and then make PR. Regards, Violeta > Mark > > > > > > Some changes are more interesting than others (the change to KEYS is > > interesting). > > > > [1] https://github.com/jsoref/tomcat/commits/spelling > > > > - > > 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 >
Re: hello
I can certainly squash. The reason I personally retain splits by misspelled word is that it's easier to rebase / resolve conflicts when I can see what word was misspelled. Typically large projects prefer to have my changes split into a couple of patches/PRs instead of as a single commit. As a quick review, you can do diff -r trunk -r spelling or similar to see the world. [1] https://github.com/xbmc/xbmc/pull/11346 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: hello
Mark, 2017-01-09 11:11 GMT+02:00 Mark Thomas : > > On 09/01/2017 08:51, Josh Soref wrote: > > Hi, > > I have a series of spelling fixes for Apache Tomcat [1]. > > > > If someone could suggest a preferred way to receive them, I'm happy to > > split them up. > > Pull request or patch file attached to a new Bugzilla issue is fine. Some of the fixes are in DBCP2 code [1] Should we fix our copy of DBCP2? I think it's better this to be changed directly in DBCP2 code. [1] https://github.com/jsoref/tomcat/commit/6c686154f8a780733bc14546056ef588c34d20b9 > Mark > > > > > > Some changes are more interesting than others (the change to KEYS is > > interesting). > > > > [1] https://github.com/jsoref/tomcat/commits/spelling > > > > - > > 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 >
Re: hello
On 09/01/2017 09:35, Violeta Georgieva wrote: > Mark, > > 2017-01-09 11:11 GMT+02:00 Mark Thomas : >> >> On 09/01/2017 08:51, Josh Soref wrote: >>> Hi, >>> I have a series of spelling fixes for Apache Tomcat [1]. >>> >>> If someone could suggest a preferred way to receive them, I'm happy to >>> split them up. >> >> Pull request or patch file attached to a new Bugzilla issue is fine. > > Some of the fixes are in DBCP2 code [1] > Should we fix our copy of DBCP2? I think it's better this to be changed > directly in DBCP2 code. I agree. DBCP2 fixes should be applied to Commons and then we'll pick them up when up next update. Mark > > [1] > https://github.com/jsoref/tomcat/commit/6c686154f8a780733bc14546056ef588c34d20b9 > >> Mark >> >> >>> >>> Some changes are more interesting than others (the change to KEYS is >>> interesting). >>> >>> [1] https://github.com/jsoref/tomcat/commits/spelling >>> >>> - >>> 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 >> > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: hello
Josh, 2017-01-09 11:38 GMT+02:00 Mark Thomas : > > On 09/01/2017 09:35, Violeta Georgieva wrote: > > Mark, > > > > 2017-01-09 11:11 GMT+02:00 Mark Thomas : > >> > >> On 09/01/2017 08:51, Josh Soref wrote: > >>> Hi, > >>> I have a series of spelling fixes for Apache Tomcat [1]. > >>> > >>> If someone could suggest a preferred way to receive them, I'm happy to > >>> split them up. > >> > >> Pull request or patch file attached to a new Bugzilla issue is fine. > > > > Some of the fixes are in DBCP2 code [1] > > Should we fix our copy of DBCP2? I think it's better this to be changed > > directly in DBCP2 code. > > I agree. DBCP2 fixes should be applied to Commons and then we'll pick > them up when up next update. Please review this document https://github.com/apache/tomcat/blob/trunk/MERGE.txt We reuse code from other Apache projects Violeta > Mark > > > > > [1] > > https://github.com/jsoref/tomcat/commit/6c686154f8a780733bc14546056ef588c34d20b9 > > > >> Mark > >> > >> > >>> > >>> Some changes are more interesting than others (the change to KEYS is > >>> interesting). > >>> > >>> [1] https://github.com/jsoref/tomcat/commits/spelling > >>> > >>> - > >>> 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 > >> > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
Re: [VOTE] Release Apache Tomcat 8.5.10
On 06/01/2017 15:58, Rémy Maucherat wrote: > 2017-01-06 16:52 GMT+01:00 Violeta Georgieva : > >> With r1775598 changes, the declaration of the scripting variable now is in >> try/finally block and it is not visible outside this block. >> >> http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/a >> pache/jasper/compiler/Generator.java?view=markup&pathrev=1775598#l2713 >> > This is independent of the previous issue, so you can either remove the > try/finally for simple tags, or fix it if you have a test on hand, I'm thinking that these couple of Jasper issues plus the APR/native issue I stumbled across make it worth cancelling the current 8.5.x and 9.0.x releases and re-rolling. Thoughts? Assuming these is general agreement, I'll probably re-tag later this afternoon. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
TomcatCon @ ApacheCon
All, After speaking to various folks at various times about some form of Tomcat conference, I've finally got around to actually doing something about it. I'm like to try and do something alongside ApacheCon NA 2017. I've started a discussion on the users list. All help, support, ideas etc. welcome on that thread. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: hello
2017-01-09 10:51 GMT+02:00 Josh Soref : > > Hi, > I have a series of spelling fixes for Apache Tomcat [1]. > I reviewed these changes. Please see the comments. When you are ready squash the commits and make PR. I'll commit the changes. > If someone could suggest a preferred way to receive them, I'm happy to > split them up. > > Some changes are more interesting than others (the change to KEYS is > interesting). I didn't see any changes to KEYS. > > [1] https://github.com/jsoref/tomcat/commits/spelling > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
Re: hello
2017-01-09 11:23 GMT+02:00 Josh Soref : > > I can certainly squash. The reason I personally retain splits by misspelled word is that it's easier to rebase / resolve conflicts when I can see what word was misspelled. > > Typically large projects prefer to have my changes split into a couple of patches/PRs instead of as a single commit. > Yes that's true. I also prefer separate patches. But in this case this is just a spelling correction and I think we can use a single commit. > As a quick review, you can do diff -r trunk -r spelling or similar to see the world. > > [1] https://github.com/xbmc/xbmc/pull/11346 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
Re: hello
https://github.com/jsoref/tomcat/commit/7c6bc40ac289ee7e7c9655c69a529f18afb5b92f - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.10
2017-01-09 13:55 GMT+02:00 Mark Thomas : > > On 06/01/2017 15:58, Rémy Maucherat wrote: > > 2017-01-06 16:52 GMT+01:00 Violeta Georgieva : > > > >> With r1775598 changes, the declaration of the scripting variable now is in > >> try/finally block and it is not visible outside this block. > >> > >> http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/a > >> pache/jasper/compiler/Generator.java?view=markup&pathrev=1775598#l2713 > >> > > This is independent of the previous issue, so you can either remove the > > try/finally for simple tags, or fix it if you have a test on hand, > > I'm thinking that these couple of Jasper issues plus the APR/native > issue I stumbled across make it worth cancelling the current 8.5.x and > 9.0.x releases and re-rolling. +1 > > Thoughts? > > Assuming these is general agreement, I'll probably re-tag later this > afternoon. > > Mark > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
Re: hello
2017-01-09 14:23 GMT+02:00 Josh Soref : > > https://github.com/jsoref/tomcat/commit/7c6bc40ac289ee7e7c9655c69a529f18afb5b92f Let's not touch the KEYS file > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
Re: hello
I can drop that, but please note that the spelling is listed as corrected in the MIT key server. I really wonder how tomcat managed to corrupt it. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: TomcatCon @ ApacheCon
On 01/09/2017 12:58 PM, Mark Thomas wrote: > All, > > After speaking to various folks at various times about some form of > Tomcat conference, I've finally got around to actually doing something > about it. I'm like to try and do something alongside ApacheCon NA 2017. That makes sense since the ApacheCon I have done 2 JUGs on tomcat-8.5, got a bunch of questions and requests to do more of the same. Cheers Jean-Frederic > > I've started a discussion on the users list. > > All help, support, ideas etc. welcome on that thread. > > Cheers, > > 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
Re: hello
Jean-Frederic, 2017-01-09 14:23 GMT+02:00 Josh Soref : > > https://github.com/jsoref/tomcat/commit/7c6bc40ac289ee7e7c9655c69a529f18afb5b92f Can you take a look at this change? It's about a spelling mistake in your email address in the KEYS file. Thanks a lot, Violeta > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
svn commit: r1777967 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AprEndpoint.java java/org/apache/tomcat/util/net/LocalStrings.properties webapps/docs/changelog.xml
Author: markt
Date: Mon Jan 9 14:12:36 2017
New Revision: 1777967
URL: http://svn.apache.org/viewvc?rev=1777967&view=rev
Log:
Remove problematic work-around
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1777967&r1=1777966&r2=1777967&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Jan 9
14:12:36 2017
@@ -2362,14 +2362,6 @@ public class AprEndpoint extends Abstrac
return result;
} else if (result == 0 || -result == Status.EAGAIN) {
return 0;
-} else if (-result == Status.APR_EGENERAL && isSecure()) {
-// Not entirely sure why this is necessary. Testing to date
has not
-// identified any issues with this but log it so it can be
tracked
-// if it is suspected of causing issues in the future.
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("socket.apr.read.sslGeneralError",
getSocket(), this));
-}
-return 0;
} else if ((-result) == Status.ETIMEDOUT || (-result) ==
Status.TIMEUP) {
if (block) {
throw new
SocketTimeoutException(sm.getString("iib.readtimeout"));
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1777967&r1=1777966&r2=1777967&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Mon
Jan 9 14:12:36 2017
@@ -115,7 +115,6 @@ socket.sslreneg=Exception re-negotiating
socket.apr.clientAbort=The client aborted the connection.
socket.apr.read.error=Unexpected error [{0}] reading data from the APR/native
socket [{1}] with wrapper [{2}].
-socket.apr.read.sslGeneralError=An APR general error was returned by the SSL
read operation on APR/native socket [{0}] with wrapper [{1}]. It will be
treated as EAGAIN and the socket returned to the poller.
socket.apr.write.error=Unexpected error [{0}] writing data to the APR/native
socket [{1}] with wrapper [{2}].
socket.apr.closed=The socket [{0}] associated with this connection has been
closed.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1777967&r1=1777966&r2=1777967&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 9 14:12:36 2017
@@ -51,6 +51,12 @@
Ensure UpgradeProcessor instances associated with closed connections
are
removed from the map of current connections to Processors. (markt)
+
+Remove a workaround for a problem previously reported with WebSocket,
+TLS and APR that treated some error conditions as not errors. The
+original problem cannot be reproduced with the current code and the
+work-around is now causing problems. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1777968 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java java/org/apache/tomcat/util/net/LocalStrings.properties webapps/docs/changelog.xml
Author: markt Date: Mon Jan 9 14:13:19 2017 New Revision: 1777968 URL: http://svn.apache.org/viewvc?rev=1777968&view=rev Log: Remove problematic work-around Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 9 14:13:19 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,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,1747536,1747 924,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-1756410,1 756778,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,1762168,176217 2,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-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1
[Bug 60461] SIGSEGV in SSLSocket.getInfos
https://bz.apache.org/bugzilla/show_bug.cgi?id=60461 Ludovic Pénet changed: What|Removed |Added Resolution|--- |FIXED Status|NEEDINFO|RESOLVED --- Comment #8 from Ludovic Pénet --- Hi. I tested with Tomcat 8.5.10 (built from sources as the release is still in progress), and it works fine. So, I think we can close this issue. -- 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
Question about Windows zip distro
Hi all, Do we intentionally ship the shell scripts along with the tomcat-native and commons-daemon-native tarballs in bin for the Windows distribution? +++ $ ll apache-tomcat-7.0.73-windows-x64.zip/apache-tomcat-7.0.73/bin/ | egrep '(tar.gz|sh)$' -rw-r--r--. 1 coty coty 21646 Nov 7 23:29 catalina.sh -rw-r--r--. 1 coty coty 204944 Nov 7 23:29 commons-daemon-native.tar.gz -rw-r--r--. 1 coty coty1922 Nov 7 23:29 configtest.sh -rw-r--r--. 1 coty coty7888 Nov 7 23:29 daemon.sh -rw-r--r--. 1 coty coty1965 Nov 7 23:29 digest.sh -rw-r--r--. 1 coty coty3547 Nov 7 23:29 setclasspath.sh -rw-r--r--. 1 coty coty1902 Nov 7 23:29 shutdown.sh -rw-r--r--. 1 coty coty1904 Nov 7 23:29 startup.sh -rw-r--r--. 1 coty coty 391853 Nov 7 23:29 tomcat-native.tar.gz -rw-r--r--. 1 coty coty5024 Nov 7 23:29 tool-wrapper.sh -rw-r--r--. 1 coty coty1908 Nov 7 23:29 version.sh +++ If not, I can amend the build.xml so that it doesn't include them; I just thought it looks odd (and would save us 631.9K off the zip size). Thanks, Coty - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Wrong type of the value of javax.servlet.error.exception_type
Hi Chris,
On Fri, Jan 6, 2017 at 9:49 PM, Christopher Schultz <
ch...@christopherschultz.net> wrote:
> Martin,
>
> On 1/6/17 8:23 AM, Martin Grigorov wrote:
> > I've just upgraded my local/development Tomcat to 8.5.10 and I've hit a
> > problem in Apache Wicket:
> >
> > java.lang.ClassCastException: java.lang.String cannot be cast to
> > java.lang.Class
> > at
> > org.apache.wicket.protocol.http.servlet.ErrorAttributes.
> of(ErrorAttributes.java:152)
> >
> >
> > line 152 is:
> > Class type = (Class > Throwable>)request.getAttribute("javax.servlet.error.exception_type");
> >
> > In a debugger I see that the value is the class name, not the class
> itself.
> >
> > According to
> > http://download.oracle.com/otn-pub/jcp/servlet-3.0-fr-
> eval-oth-JSpec/servlet-3_0-final-spec.pdf,
> > p.10.9.1, table 10-1 the type of the value should be:
> >
> > Request Attributes Type
> > javax.servlet.error.status_code java.lang.Integer
> > javax.servlet.error.exception_type java.lang.Class <<< a Class
> > javax.servlet.error.message java.lang.String
> > javax.servlet.error.exception java.lang.Throwable
> > javax.servlet.error.request_uri java.lang.String
> > javax.servlet.error.servlet_name java.lang.String
> >
> >
> > I didn't see any change related to this between 8.5.8 and 8.5.10 so I'm
> not
> > sure whether this should be a stopper for the release of 8.5.10.
>
> I only see a single instance of javax.servlet.error.exception_type in
> 8.5 trunk (in javax/servlet/RequestDispatcher.ERROR_EXCEPTION_TYPE) and
> a single use of ERROR_EXCEPTION_TYPE itself (in
> o.a.c.core.StandardHostValve) and the code is fairly straightforward:
>
> // line 330:
> request.setAttribute(RequestDispatcher.ERROR_EXCEPTION_TYPE,
> realError.getClass());
>
> The reference "realError" is a java.lang.Throwable, and, presumably,
> realError.getClass will always return a java.lang.Class object.
>
> Can you see where that request attribute is being set in your test? I
> wonder if either Wicket or the application itself is abusing that
> request attribute.
>
Thanks for your answer!
Since Tomcat is not guilty here it must be the middleware! I've found it
easily:
https://github.com/spring-projects/spring-boot/search?utf8=%E2%9C%93&q=ERROR_EXCEPTION_TYPE
I'll log an issue at Spring Boot!
>
> -chris
>
>
Memory leak found in java.util.concurrent.ForkJoinPool
All, As a result of a thread on the users list, a memory leak has been discovered in java.util.concurrent.ForkJoinPool.commonPool. It appears that use of this pool is hard-coded in multiple places such as Collection.parallelStream().forEach(). I have some ideas about how to work-around the leaks with JreMemoryLeakPreventionListener but any code that depends on the Tomcat class loader being set (e.g. JNDI lookup) is going to break if the user tries to use Collection.parallelStream(). Rory, The review Id for my report is 9046841. Anything you can do to get this accepted and in front of the right folks to fix it would be appreciated. Kind regards, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Question about Windows zip distro
On 09/01/2017 18:24, Coty Sutherland wrote: > Hi all, > > Do we intentionally ship the shell scripts along with the > tomcat-native and commons-daemon-native tarballs in bin for the > Windows distribution? Yes. The only variation is the difference in line-endings. I believe the intention is to provide users with as much flexibility as possible (i.e. you can use the .zip on Linux if you really want to) while making it work out of the box for the more obvious/popular use cases. Mark > > +++ > $ ll apache-tomcat-7.0.73-windows-x64.zip/apache-tomcat-7.0.73/bin/ | > egrep '(tar.gz|sh)$' > -rw-r--r--. 1 coty coty 21646 Nov 7 23:29 catalina.sh > -rw-r--r--. 1 coty coty 204944 Nov 7 23:29 commons-daemon-native.tar.gz > -rw-r--r--. 1 coty coty1922 Nov 7 23:29 configtest.sh > -rw-r--r--. 1 coty coty7888 Nov 7 23:29 daemon.sh > -rw-r--r--. 1 coty coty1965 Nov 7 23:29 digest.sh > -rw-r--r--. 1 coty coty3547 Nov 7 23:29 setclasspath.sh > -rw-r--r--. 1 coty coty1902 Nov 7 23:29 shutdown.sh > -rw-r--r--. 1 coty coty1904 Nov 7 23:29 startup.sh > -rw-r--r--. 1 coty coty 391853 Nov 7 23:29 tomcat-native.tar.gz > -rw-r--r--. 1 coty coty5024 Nov 7 23:29 tool-wrapper.sh > -rw-r--r--. 1 coty coty1908 Nov 7 23:29 version.sh > +++ > > If not, I can amend the build.xml so that it doesn't include them; I > just thought it looks odd (and would save us 631.9K off the zip size). > > > > Thanks, > Coty > > - > 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
svn commit: r1778061 - in /tomcat/trunk: build.xml java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java webapps/docs
Author: markt
Date: Mon Jan 9 21:50:53 2017
New Revision: 1778061
URL: http://svn.apache.org/viewvc?rev=1778061&view=rev
Log:
Add memory protection for ForkJoinPool.commonPool() related memory leaks.
Added:
tomcat/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java
(with props)
Modified:
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/listeners.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1778061&r1=1778060&r2=1778061&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jan 9 21:50:53 2017
@@ -336,6 +336,8 @@
+
+
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1778061&r1=1778060&r2=1778061&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Mon Jan 9 21:50:53 2017
@@ -25,6 +25,7 @@ import java.net.URL;
import java.net.URLConnection;
import java.sql.DriverManager;
import java.util.StringTokenizer;
+import java.util.concurrent.ForkJoinPool;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -33,6 +34,7 @@ import javax.xml.parsers.ParserConfigura
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.startup.SafeForkJoinWorkerThreadFactory;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -63,6 +65,8 @@ public class JreMemoryLeakPreventionList
private static final StringManager sm =
StringManager.getManager(Constants.Package);
+private static final String FORK_JOIN_POOL_THREAD_FACTORY_PROPERTY =
+"java.util.concurrent.ForkJoinPool.common.threadFactory";
/**
* Protect against the memory leak caused when the first call to
* java.awt.Toolkit.getDefaultToolkit() is triggered
@@ -161,6 +165,19 @@ public class JreMemoryLeakPreventionList
}
/**
+ * {@link ForkJoinPool#commonPool()} creates a thread pool that, by
default,
+ * creates threads that retain references to the thread context class
+ * loader.
+ */
+private boolean forkJoinCommonPoolProtection = true;
+public boolean getForkJoinCommonPoolProtection() {
+return forkJoinCommonPoolProtection;
+}
+public void setForkJoinCommonPoolProtection(boolean
forkJoinCommonPoolProtection) {
+this.forkJoinCommonPoolProtection = forkJoinCommonPoolProtection;
+}
+
+/**
* List of comma-separated fully qualified class names to load and
initialize during
* the startup of this Listener. This allows to pre-load classes that are
known to
* provoke classloader leaks if they are loaded during a request
processing.
@@ -336,6 +353,17 @@ public class JreMemoryLeakPreventionList
}
}
+/*
+ * Present in Java 8 onwards
+ */
+if (forkJoinCommonPoolProtection) {
+// Don't override any explicitly set property
+if
(System.getProperty(FORK_JOIN_POOL_THREAD_FACTORY_PROPERTY) == null) {
+
System.setProperty(FORK_JOIN_POOL_THREAD_FACTORY_PROPERTY,
+
SafeForkJoinWorkerThreadFactory.class.getName());
+}
+}
+
if (classesToInitialize != null) {
StringTokenizer strTok =
new StringTokenizer(classesToInitialize, ", \r\n\t");
Added:
tomcat/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java?rev=1778061&view=auto
==
---
tomcat/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java
(added)
+++
tomcat/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java
Mon Jan 9 21:50:53 2017
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licens
svn commit: r1778065 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ webapps/docs/ webapps/docs/config/
Author: markt Date: Mon Jan 9 21:55:54 2017 New Revision: 1778065 URL: http://svn.apache.org/viewvc?rev=1778065&view=rev Log: Add memory protection for ForkJoinPool.commonPool() related memory leaks. Added: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java - copied unchanged from r1778061, tomcat/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/build.xml tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 9 21:55:54 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,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,1747536,1747 924,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-1756410,1 756778,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,1762168,176217 2,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,176
svn commit: r1778068 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ java/org/apache/catalina/startup/ webapps/docs/ webapps/docs/config/
Author: markt Date: Mon Jan 9 22:19:48 2017 New Revision: 1778068 URL: http://svn.apache.org/viewvc?rev=1778068&view=rev Log: Add memory protection for ForkJoinPool.commonPool() related memory leaks. The 7.0.x fix is a little more involved since the ThreadFactory required can only be compiled with Java 7 onwards. Added: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java - copied unchanged from r1778065, tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/SafeForkJoinWorkerThreadFactory.java Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/build.xml tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 9 22:19:48 2017 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702 742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1 726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213 -/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,174081
[GitHub] tomcat pull request #37: Spelling fixes
GitHub user jsoref opened a pull request: https://github.com/apache/tomcat/pull/37 Spelling fixes * abandoned * adapter * application * approach * assign * assuming * async * asynchronous * attempt * attribute * authoritative * authorization * available * background * beginning * being * belonging * blocking * boolean * broadcast * cacheable * calendar * candidate * character * classes * classpath * collected * complex * concurrent * configured * connection * constant * constraint * containing * context * couldn't * coyote * created * customization * customize * deflate * dependency * deployment * describing * description * descriptor * destroy * digest * directory * documentation * doesn't * empty * encodeable * even though * exception * experiences * explicitly * expressions * extension * externally * factory * fallback * following * formats * formatter * forwarded * fujitsu * function * functionality * fundamental * further * handler * handshake * iface * ignore * implementation * implicit * important * independently * individually * initialization * initialized * initializer * initially * initiated * instance * instantiation * interceptor * interest * interfaces * interpret * interrupt * interrupted * invocation * language * length * library * lifecycle * localpart * manifest * maucherat * message * messages * metadata * multicast * multiple * namespace * normalized * notification * precondition * preemptive * prefix * presence * principal's * privileges * programmatically * pseudo * public * received * references * registration * registry * reinstantiating * related * remember * renegotiation * representation * requested * required * resetting * resource * response * result * rewrite * running * semantics * serializations * servlet * session * shouldn't * significant * simultaneously * singing * skipping * special * specified * specifying * standard * stopped * substitute * support * supported * syntax * system * tag * threshold * tomcat * trailer * trivial * undeclared * undeploy * underlying * unique * unknown * usually * variable * version * weren't * writable * write * writing You can merge this pull request into a Git repository by running: $ git pull https://github.com/jsoref/tomcat spelling Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat/pull/37.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #37 commit 8e3516bb5944359a3bde5e0e7b7bd6d2999c7846 Author: Josh Soref Date: 2017-01-10T05:45:37Z Spelling fixes * abandoned * adapter * application * approach * assign * assuming * async * asynchronous * attempt * attribute * authoritative * authorization * available * background * beginning * being * belonging * blocking * boolean * broadcast * cacheable * calendar * candidate * character * classes * classpath * collected * complex * concurrent * configured * connection * constant * constraint * containing * context * couldn't * coyote * created * customization * customize * deflate * dependency * deployment * describing * description * descriptor * destroy * digest * directory * documentation * doesn't * empty * encodeable * even though * exception * experiences * explicitly * expressions * extension * externally * factory * fallback * following * formats * formatter * forwarded * fujitsu * function * functionality * fundamental * further * handler * handshake * iface * ignore * implementation * implicit * important * independently * individually * initialization * initialized * initializer * initially * initiated * instance * instantiation * interceptor * interest * interfaces * interpret * interrupt * interrupted * invocation * language * length * library * lifecycle * localpart * manifest * maucherat * message * messages * me
svn commit: r1778090 - in /tomcat/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ webapps/docs/
Author: kfujino
Date: Tue Jan 10 07:22:43 2017
New Revision: 1778090
URL: http://svn.apache.org/viewvc?rev=1778090&view=rev
Log:
Enable reset the statistics without restarting the pool.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1778090&r1=1778089&r2=1778090&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Tue Jan 10 07:22:43 2017
@@ -1251,6 +1251,19 @@ public class ConnectionPool {
}
/**
+ * reset the statistics of this pool.
+ */
+public void resetStats() {
+borrowedCount.set(0);
+returnedCount.set(0);
+createdCount.set(0);
+releasedCount.set(0);
+reconnectedCount.set(0);
+removeAbandonedCount.set(0);
+releasedIdleCount.set(0);
+}
+
+/**
* Tread safe wrapper around a future for the regular queue
* This one retrieves the pooled connection object
* and performs the initialization according to
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1778090&r1=1778089&r2=1778090&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Tue Jan 10 07:22:43 2017
@@ -837,6 +837,17 @@ public class DataSourceProxy implements
}
}
+/**
+ * reset the statistics of this pool.
+ */
+public void resetStats() {
+try {
+createPool().resetStats();
+} catch (SQLException x) {
+throw new RuntimeException(x);
+}
+}
+
//=
// PROPERTIES / CONFIGURATION
//=
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1778090&r1=1778089&r2=1778090&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Tue Jan 10 07:22:43 2017
@@ -218,6 +218,12 @@ public class ConnectionPool extends Noti
public void testIdle() {
pool.testAllIdle();
}
+
+@Override
+public void resetStats() {
+pool.resetStats();
+}
+
//=
// POOL PROPERTIES
//=
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java?rev=1778090&r1=1778089&r2=1778090&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
Tue Jan 10 07:22:43 2017
@@ -74,6 +74,11 @@ public interface ConnectionPoolMBean ext
*/
public void purgeOnReturn();
+/**
+ * reset the statistics of this pool.
+ */
+public void resetStats();
+
//=
// POOL NOTIFICATIONS
//
svn commit: r1778091 - in /tomcat/tc8.5.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ webapps/docs/
Author: kfujino
Date: Tue Jan 10 07:26:12 2017
New Revision: 1778091
URL: http://svn.apache.org/viewvc?rev=1778091&view=rev
Log:
Enable reset the statistics without restarting the pool.
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1778091&r1=1778090&r2=1778091&view=diff
==
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Tue Jan 10 07:26:12 2017
@@ -1251,6 +1251,19 @@ public class ConnectionPool {
}
/**
+ * reset the statistics of this pool.
+ */
+public void resetStats() {
+borrowedCount.set(0);
+returnedCount.set(0);
+createdCount.set(0);
+releasedCount.set(0);
+reconnectedCount.set(0);
+removeAbandonedCount.set(0);
+releasedIdleCount.set(0);
+}
+
+/**
* Tread safe wrapper around a future for the regular queue
* This one retrieves the pooled connection object
* and performs the initialization according to
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1778091&r1=1778090&r2=1778091&view=diff
==
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Tue Jan 10 07:26:12 2017
@@ -824,6 +824,7 @@ public class DataSourceProxy implements
throw new RuntimeException(x);
}
}
+
/**
* The total number of connections reconnected by this pool.
* @return the reconnected connection count
@@ -835,6 +836,18 @@ public class DataSourceProxy implements
throw new RuntimeException(x);
}
}
+
+/**
+ * reset the statistics of this pool.
+ */
+public void resetStats() {
+try {
+createPool().resetStats();
+} catch (SQLException x) {
+throw new RuntimeException(x);
+}
+}
+
//=
// PROPERTIES / CONFIGURATION
//=
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1778091&r1=1778090&r2=1778091&view=diff
==
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Tue Jan 10 07:26:12 2017
@@ -218,6 +218,12 @@ public class ConnectionPool extends Noti
public void testIdle() {
pool.testAllIdle();
}
+
+@Override
+public void resetStats() {
+pool.resetStats();
+}
+
//=
// POOL PROPERTIES
//=
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java?rev=1778091&r1=1778090&r2=1778091&view=diff
==
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/s
svn commit: r1778092 - in /tomcat/tc8.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ webapps/docs/
Author: kfujino
Date: Tue Jan 10 07:28:57 2017
New Revision: 1778092
URL: http://svn.apache.org/viewvc?rev=1778092&view=rev
Log:
Enable reset the statistics without restarting the pool.
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1778092&r1=1778091&r2=1778092&view=diff
==
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Tue Jan 10 07:28:57 2017
@@ -1240,6 +1240,19 @@ public class ConnectionPool {
}
/**
+ * reset the statistics of this pool.
+ */
+public void resetStats() {
+borrowedCount.set(0);
+returnedCount.set(0);
+createdCount.set(0);
+releasedCount.set(0);
+reconnectedCount.set(0);
+removeAbandonedCount.set(0);
+releasedIdleCount.set(0);
+}
+
+/**
* Tread safe wrapper around a future for the regular queue
* This one retrieves the pooled connection object
* and performs the initialization according to
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1778092&r1=1778091&r2=1778092&view=diff
==
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Tue Jan 10 07:28:57 2017
@@ -798,6 +798,7 @@ public class DataSourceProxy implements
throw new RuntimeException(x);
}
}
+
/**
* The total number of connections reconnected by this pool.
* @return the reconnected connection count
@@ -809,6 +810,18 @@ public class DataSourceProxy implements
throw new RuntimeException(x);
}
}
+
+/**
+ * reset the statistics of this pool.
+ */
+public void resetStats() {
+try {
+createPool().resetStats();
+} catch (SQLException x) {
+throw new RuntimeException(x);
+}
+}
+
//=
// PROPERTIES / CONFIGURATION
//=
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1778092&r1=1778091&r2=1778092&view=diff
==
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Tue Jan 10 07:28:57 2017
@@ -218,6 +218,12 @@ public class ConnectionPool extends Noti
public void testIdle() {
pool.testAllIdle();
}
+
+@Override
+public void resetStats() {
+pool.resetStats();
+}
+
//=
// POOL PROPERTIES
//=
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java?rev=1778092&r1=1778091&r2=1778092&view=diff
==
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/s
svn commit: r1778093 - in /tomcat/tc7.0.x/trunk: modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ webapps/docs/
Author: kfujino
Date: Tue Jan 10 07:31:31 2017
New Revision: 1778093
URL: http://svn.apache.org/viewvc?rev=1778093&view=rev
Log:
Enable reset the statistics without restarting the pool.
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1778093&r1=1778092&r2=1778093&view=diff
==
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Tue Jan 10 07:31:31 2017
@@ -1243,6 +1243,19 @@ public class ConnectionPool {
}
/**
+ * reset the statistics of this pool.
+ */
+public void resetStats() {
+borrowedCount.set(0);
+returnedCount.set(0);
+createdCount.set(0);
+releasedCount.set(0);
+reconnectedCount.set(0);
+removeAbandonedCount.set(0);
+releasedIdleCount.set(0);
+}
+
+/**
* Tread safe wrapper around a future for the regular queue
* This one retrieves the pooled connection object
* and performs the initialization according to
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1778093&r1=1778092&r2=1778093&view=diff
==
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Tue Jan 10 07:31:31 2017
@@ -784,6 +784,7 @@ public class DataSourceProxy implements
throw new RuntimeException(x);
}
}
+
/**
* The total number of connections reconnected by this pool.
* @return the reconnected connection count
@@ -795,6 +796,18 @@ public class DataSourceProxy implements
throw new RuntimeException(x);
}
}
+
+/**
+ * reset the statistics of this pool.
+ */
+public void resetStats() {
+try {
+createPool().resetStats();
+} catch (SQLException x) {
+throw new RuntimeException(x);
+}
+}
+
//=
// PROPERTIES / CONFIGURATION
//=
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1778093&r1=1778092&r2=1778093&view=diff
==
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Tue Jan 10 07:31:31 2017
@@ -219,6 +219,12 @@ public class ConnectionPool extends Noti
public void testIdle() {
pool.testAllIdle();
}
+
+@Override
+public void resetStats() {
+pool.resetStats();
+}
+
//=
// POOL PROPERTIES
//=
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java?rev=1778093&r1=1778092&r2=1778093&view=diff
==
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/s
