ant problems

[jean-frederic clere]

Hi,

I have problems while building trunk:
/home/jfclere/TMP/tomcat/build.xml:693: javac doesn't support the
"release" attribute

Is that  expected I have tried java11 and java8 (openjdk)?

-- 
Cheers

Jean-Frederic

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: ant problems

[Emmanuel Bourg]

Le 09/08/2018 à 11:18, jean-frederic clere a écrit :

> I have problems while building trunk:
> /home/jfclere/TMP/tomcat/build.xml:693: javac doesn't support the
> "release" attribute
> 
> Is that  expected I have tried java11 and java8 (openjdk)?

No that's not expected, Java 9+ supports the new --release parameter,
but Ant simply ignores it if you use an older version. What's your
version of Ant?

Emmanuel Bourg

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 62603] Changes in tag files are not reflected in the rendered view or they end up with a java.lang.NoClassDefFoundError

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=62603

--- Comment #3 from Mark Thomas  ---
I like it. Thanks for the offer of a patch. Normally I'd say yes please but in
this case this issue is blocking me getting the next set of releases out so I
am going to start working on it immediately.

Once thing I did notice is that we'll also need to take account of firstTime to
ensure we don;t skip compiling a new JSP because we are in the
JspRuntimeContext.checkCompile() loop.

-- 
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 62603] Changes in tag files are not reflected in the rendered view or they end up with a java.lang.NoClassDefFoundError

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=62603

--- Comment #4 from Jordi  ---
Agree, great, thanks Mark!

-- 
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 62611] New: Compress log files after rotation

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=62611

Bug ID: 62611
   Summary: Compress log files after rotation
   Product: Tomcat 9
   Version: 9.0.10
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: ebo...@apache.org
  Target Milestone: -

Log files generated by the AccessLogValve and the JULI FileHandler could be
automatically compressed after the rotation to save space.

Some thoughts on a possible implementation:
- the compression is optional and configured by new valve/handler parameters.
- the actual compression could occur a few days after the rotation to keep the
recent log files easily readable.
- configuring the compression format would be nice but not essential, the files
can simply be gziped.

-- 
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

svn commit: r1837719 - in /tomcat/trunk/java/org/apache/catalina/valves: LocalStrings.properties LocalStrings_ja.properties

[markt]

Author: markt
Date: Thu Aug  9 12:08:32 2018
New Revision: 1837719

URL: http://svn.apache.org/viewvc?rev=1837719&view=rev
Log:
Fix corrupted EN DASH

Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties

Modified: tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1837719&r1=1837718&r2=1837719&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties 
[UTF-8] Thu Aug  9 12:08:32 2018
@@ -32,7 +32,7 @@ accessLogValve.writeFail=Failed to write
 # Error report valve
 # Default error page should not have '[' ']' symbols around substituted text 
fragments.
 # https://bz.apache.org/bugzilla/show_bug.cgi?id=61134
-errorReportValve.statusHeader=HTTP Status {0} � {1}
+errorReportValve.statusHeader=HTTP Status {0} – {1}
 errorReportValve.type=Type
 errorReportValve.exceptionReport=Exception Report
 errorReportValve.statusReport=Status Report

Modified: 
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties?rev=1837719&r1=1837718&r2=1837719&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties 
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties 
[UTF-8] Thu Aug  9 12:08:32 2018
@@ -17,7 +17,7 @@ jdbcAccessLogValve.exception=アクセ�
 # Error report valve
 # Default error page should not have '[' ']' symbols around substituted text 
fragments.
 # https://bz.apache.org/bugzilla/show_bug.cgi?id=61134
-errorReportValve.statusHeader=HTTPステータス {0} - {1}
+errorReportValve.statusHeader=HTTPステータス {0} – {1}
 errorReportValve.statusReport=ステータスレポート
 errorReportValve.message=メッセージ
 errorReportValve.description=説明



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1837726 - in /tomcat/trunk: java/org/apache/jasper/compiler/JspRuntimeContext.java java/org/apache/jasper/servlet/JspServletWrapper.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Aug  9 13:42:16 2018
New Revision: 1837726

URL: http://svn.apache.org/viewvc?rev=1837726&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62603
Fix a potential race condition when development mode is disabled and background 
compilation checks are enabled. It was possible that some updates would not 
take effect and/or ClassNotFoundExceptions would occur.

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1837726&r1=1837725&r2=1837726&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Thu Aug 
 9 13:42:16 2018
@@ -28,11 +28,14 @@ import java.security.CodeSource;
 import java.security.PermissionCollection;
 import java.security.Policy;
 import java.security.cert.Certificate;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 
 import org.apache.jasper.Constants;
 import org.apache.jasper.JspCompilationContext;
@@ -176,6 +179,11 @@ public final class JspRuntimeContext {
  */
 private final Map smaps = new ConcurrentHashMap<>();
 
+/**
+ * Flag that indicates if a background compilation check is in progress.
+ */
+private volatile boolean compileCheckInProgress = false;
+
 
 // -- Public Methods
 
@@ -361,6 +369,11 @@ public final class JspRuntimeContext {
 return;
 }
 
+List wrappersToReload = new ArrayList<>();
+// Tell JspServletWrapper to ignore the reload attribute while this
+// check is in progress. See BZ 62603.
+compileCheckInProgress = true;
+
 Object [] wrappers = jsps.values().toArray();
 for (int i = 0; i < wrappers.length; i++ ) {
 JspServletWrapper jsw = (JspServletWrapper)wrappers[i];
@@ -370,6 +383,9 @@ public final class JspRuntimeContext {
 synchronized(jsw) {
 try {
 ctxt.compile();
+if (jsw.getReload()) {
+wrappersToReload.add(jsw);
+}
 } catch (FileNotFoundException ex) {
 ctxt.incrementRemoved();
 } catch (Throwable t) {
@@ -380,6 +396,31 @@ public final class JspRuntimeContext {
 }
 }
 
+// See BZ 62603.
+// OK to process reload flag now.
+compileCheckInProgress = false;
+// Ensure all servlets and tags that need to be reloaded, are reloaded.
+for (JspServletWrapper jsw : wrappersToReload) {
+// Triggers reload
+try {
+if (jsw.isTagFile()) {
+// Although this is a public method, all other paths to 
this
+// method use this sync and it is required to prevent race
+// conditions during the reload.
+synchronized (this) {
+jsw.loadTagFile();
+}
+} else {
+jsw.getServlet();
+}
+} catch (ServletException e) {
+jsw.getServletContext().log("Servlet reload failed", e);
+}
+}
+}
+
+public boolean isCompileCheckInProgress() {
+return compileCheckInProgress;
 }
 
 /**

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1837726&r1=1837725&r2=1837726&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Thu Aug  
9 13:42:16 2018
@@ -153,15 +153,29 @@ public class JspServletWrapper {
 this.reload = reload;
 }
 
+public boolean getReload() {
+return reload;
+}
+
+private boolean getReloadInternal() {
+return firstTime || reload && 
!ctxt.getRuntimeContext().isCompileCheckInProgress();
+}
+
 public Servlet getServlet() throws ServletException {
-// DCL on 'reload' requires that 'reload' be volatile
-// (this also forces a read memory barrier, ensuring the
-// new servlet object is read consistently)

svn commit: r1837727 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/jasper/compiler/JspRuntimeContext.java java/org/apache/jasper/servlet/JspServletWrapper.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Aug  9 13:44:24 2018
New Revision: 1837727

URL: http://svn.apache.org/viewvc?rev=1837727&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62603
Fix a potential race condition when development mode is disabled and background 
compilation checks are enabled. It was possible that some updates would not 
take effect and/or ClassNotFoundExceptions would occur.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 13:44:24 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,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,1747
 
404,1747506,1747536,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-1
 
756289,1756408-1756410,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-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,17

svn commit: r1837728 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/JspRuntimeContext.java java/org/apache/jasper/servlet/JspServletWrapper.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Aug  9 13:48:24 2018
New Revision: 1837728

URL: http://svn.apache.org/viewvc?rev=1837728&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62603
Fix a potential race condition when development mode is disabled and background 
compilation checks are enabled. It was possible that some updates would not 
take effect and/or ClassNotFoundExceptions would occur.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 13:48:24 2018
@@ -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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,

[Bug 62603] Changes in tag files are not reflected in the rendered view or they end up with a java.lang.NoClassDefFoundError

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=62603

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #5 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.11 onwards
- 8.5.x for 8.5.33 onwards
- 7.0.x for 7.0.91 onwards

I've tested this with a debugger and I can force a problem (updated tag doe
snot take effect) before the patch but not afterwards. Additional review /
testing welcome.

-- 
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

svn commit: r1837731 - in /tomcat/trunk: java/org/apache/catalina/startup/Bootstrap.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Aug  9 14:04:21 2018
New Revision: 1837731

URL: http://svn.apache.org/viewvc?rev=1837731&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62607
Return a non-zero exit code from catalina.[bat|sh] run if Tomcat fails to start.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1837731&r1=1837730&r2=1837731&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Thu Aug  9 
14:04:21 2018
@@ -490,11 +490,14 @@ public final class Bootstrap {
 daemon.setAwait(true);
 daemon.load(args);
 daemon.start();
+if (null == daemon.getServer()) {
+System.exit(1);
+}
 } else if (command.equals("stop")) {
 daemon.stopServer(args);
 } else if (command.equals("configtest")) {
 daemon.load(args);
-if (null==daemon.getServer()) {
+if (null == daemon.getServer()) {
 System.exit(1);
 }
 System.exit(0);

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1837731&r1=1837730&r2=1837731&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Aug  9 14:04:21 2018
@@ -99,6 +99,10 @@
 62560: Add oraclepki.jar to the list of JARs
 ignored by StandardJarScanner. (markt)
   
+  
+62607: Return a non-zero exit code from
+catalina.[bat|sh] run if Tomcat fails to start. (markt)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 62607] Catalina exits with status code 0 when the configuration is invalid

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=62607

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.11 onwards
- 8.5.x for 8.5.33 onwards
- 7.0.x for 7.0.91 onwards

-- 
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

svn commit: r1837733 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/Bootstrap.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Aug  9 14:14:22 2018
New Revision: 1837733

URL: http://svn.apache.org/viewvc?rev=1837733&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62607
Return a non-zero exit code from catalina.[bat|sh] run if Tomcat fails to start.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 14:14:22 2018
@@ -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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,182

svn commit: r1837732 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/startup/Bootstrap.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Aug  9 14:13:31 2018
New Revision: 1837732

URL: http://svn.apache.org/viewvc?rev=1837732&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62607
Return a non-zero exit code from catalina.[bat|sh] run if Tomcat fails to start.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 14:13:31 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,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,1747
 
404,1747506,1747536,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-1
 
756289,1756408-1756410,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-176205
 
3,1762123,1762168,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-1763272,1763276-1763277,1763319-1763320,1763370,1763372,17633

svn commit: r1837734 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/

[markt]

Author: markt
Date: Thu Aug  9 14:23:15 2018
New Revision: 1837734

URL: http://svn.apache.org/viewvc?rev=1837734&view=rev
Log:
Update BCEL (no changes)

Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/   (props changed)

Propchange: tomcat/trunk/java/org/apache/tomcat/util/bcel/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 14:23:15 2018
@@ -1,3 +1,3 @@
-/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1694910,1747273-1829827
+/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1694910,1747273-1837733
 
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:1694911-1747272
 /jakarta/bcel/trunk/src/main/java/org/apache/bcel:886845-1149511



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1837735 - /tomcat/trunk/java/org/apache/tomcat/util/codec/

[markt]

Author: markt
Date: Thu Aug  9 14:26:04 2018
New Revision: 1837735

URL: http://svn.apache.org/viewvc?rev=1837735&view=rev
Log:
Update Codec (no changes)

Modified:
tomcat/trunk/java/org/apache/tomcat/util/codec/   (props changed)

Propchange: tomcat/trunk/java/org/apache/tomcat/util/codec/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 14:26:04 2018
@@ -1 +1 @@
-/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec:1459201-1817136
+/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec:1459201-1837734



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 62607] Catalina exits with status code 0 when the configuration is invalid

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=62607

--- Comment #2 from Emmanuel Bourg  ---
Thank you Mark, I could have committed it though ;)

-- 
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

svn commit: r1837736 - in /tomcat/trunk: MERGE.txt java/org/apache/tomcat/util/http/fileupload/MultipartStream.java

[markt]

Author: markt
Date: Thu Aug  9 14:40:29 2018
New Revision: 1837736

URL: http://svn.apache.org/viewvc?rev=1837736&view=rev
Log:
Update FileUpload
Most changes had already been applied (because we back-ported them to Commons 
after some local clean-up)

Modified:
tomcat/trunk/MERGE.txt

tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java

Modified: tomcat/trunk/MERGE.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/MERGE.txt?rev=1837736&r1=1837735&r2=1837736&view=diff
==
--- tomcat/trunk/MERGE.txt (original)
+++ tomcat/trunk/MERGE.txt Thu Aug  9 14:40:29 2018
@@ -57,7 +57,7 @@ FileUpload
 Sub-tree:
 src/main/java/org/apache/commons/fileupload
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-6c00d575a9521c386743891fd34bc5181174cc01
+b1498c9877d751f8bc4635a6f252ebdfcba28518
 
 Note: Tomcat's copy of fileupload also includes classes copied manually (rather
   than svn copied) from Commons IO.

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java?rev=1837736&r1=1837735&r2=1837736&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java 
Thu Aug  9 14:40:29 2018
@@ -229,7 +229,7 @@ public class MultipartStream {
 /**
  * The table for Knuth-Morris-Pratt search algorithm.
  */
-private int[] boundaryTable;
+private final int[] boundaryTable;
 
 /**
  * The length of the buffer used for processing the request.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1837737 - in /tomcat/trunk: ./ java/org/apache/tomcat/dbcp/pool2/ java/org/apache/tomcat/dbcp/pool2/impl/ webapps/docs/

[markt]

Author: markt
Date: Thu Aug  9 14:51:00 2018
New Revision: 1837737

URL: http://svn.apache.org/viewvc?rev=1837737&view=rev
Log:
Update the internal fork of Apache Commons Pool 2 to 3e02523 (2018-08-09) to 
pick up some bug fixes and enhancements.

Modified:
tomcat/trunk/MERGE.txt

tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObject.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObjectFactory.java

tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java

tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java

tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/PoolImplUtils.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/MERGE.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/MERGE.txt?rev=1837737&r1=1837736&r2=1837737&view=diff
==
--- tomcat/trunk/MERGE.txt (original)
+++ tomcat/trunk/MERGE.txt Thu Aug  9 14:51:00 2018
@@ -75,4 +75,4 @@ Pool2
 Sub-tree
 src/main/java/org/apache/commons/pool2
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-dfef97be70e8b1c3edb44b972fc7f700f3fe6255
+3e02523b6907fb22f3582544fe362c785821bcb8

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java?rev=1837737&r1=1837736&r2=1837737&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
 Thu Aug  9 14:51:00 2018
@@ -30,8 +30,8 @@ package org.apache.tomcat.dbcp.pool2;
  *
  * @since 2.0
  */
-public abstract class BaseKeyedPooledObjectFactory extends BaseObject
-implements KeyedPooledObjectFactory {
+public abstract class BaseKeyedPooledObjectFactory extends BaseObject
+implements KeyedPooledObjectFactory {
 
 /**
  * Create an instance that can be served by the pool.
@@ -64,6 +64,7 @@ public abstract class BaseKeyedPooledObj
  * Destroy an instance no longer needed by the pool.
  * 
  * The default implementation is a no-op.
+ * 
  *
  * @param key the key used when selecting the instance
  * @param p a {@code PooledObject} wrapping the instance to be destroyed
@@ -78,6 +79,7 @@ public abstract class BaseKeyedPooledObj
  * Ensures that the instance is safe to be returned by the pool.
  * 
  * The default implementation always returns {@code true}.
+ * 
  *
  * @param key the key used when selecting the object
  * @param p a {@code PooledObject} wrapping the instance to be validated
@@ -92,6 +94,7 @@ public abstract class BaseKeyedPooledObj
  * Reinitialize an instance to be returned by the pool.
  * 
  * The default implementation is a no-op.
+ * 
  *
  * @param key the key used when selecting the object
  * @param p a {@code PooledObject} wrapping the instance to be activated
@@ -106,6 +109,7 @@ public abstract class BaseKeyedPooledObj
  * Uninitialize an instance to be returned to the idle object pool.
  * 
  * The default implementation is a no-op.
+ * 
  *
  * @param key the key used when selecting the object
  * @param p a {@code PooledObject} wrapping the instance to be passivated

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java?rev=1837737&r1=1837736&r2=1837737&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java Thu Aug  
9 14:51:00 2018
@@ -86,6 +86,7 @@ public abstract class BaseObjectPool
  * 
  * This affects the behavior of isClosed and
  * assertOpen.
+ * 
  */
 @Override
 public void close() {

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedO

svn commit: r1837746 [1/5] - in /tomcat/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ java/org/apache/tomca

[markt]

Author: markt
Date: Thu Aug  9 16:50:30 2018
New Revision: 1837746

URL: http://svn.apache.org/viewvc?rev=1837746&view=rev
Log:
Update the internal fork of Apache Commons DBCP 2 to abc0484 (2018-08-09) to 
pick up some bug fixes and enhancements.

Modified:
tomcat/trunk/MERGE.txt
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/Utils.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/DataSourceXAConnectionFactory.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedConnection.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnection.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContext.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionRegistry.java

tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/XAConnectionFactory.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/MERGE.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/MERGE.txt?rev=1837746&r1=1837745&r2=1837746&view=diff
==
--- tomcat/trunk/MERGE.txt (original)
+++ tomcat/trunk/MERGE.txt Thu Aug  9 16:50:30 2018
@@ -69,7 +69,7 @@ Sub-tree
 src/main/java/org/apache/commons/dbcp2
 src/main/resources/org/apache/commons/dbcp2
 The SHA1 ID for the most recent commit to be merged to Tomcat is:
-d7aa662fbbb99e536ae28c47d0c4e1d51e39d5b9
+abc048454398d8c9924a1af9c04501817f44a11d
 
 Pool2
 Sub-tree

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1837746&r1=1837745&r2=1837746&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java Thu Aug 
 9 16:50:30 2018
@@ -224,6 +224,11 @@ public class BasicDataSource implements
 private volatile String defaultCatalog;
 
 /**
+ * The default "schema" of connections created by this pool.
+ */
+private volatile String defaultSchema;
+
+/**
  * Returns the default catalog.
  *
  * @return the default catalog
@@ -234,6 +239,17 @@ public class BasicDataSource implements
 }
 
 /**
+ * Returns the default schema.
+ *
+ * @return the default schema.
+ * @since 2.5.0
+ */
+@Override
+public String getDefaultSchema() {
+return this.defaultSchema;
+}
+
+/**
  * 
  * Sets the default catalog.
  * 
@@ -255,6 +271,28 @@ public class BasicDataSource implements
 }
 
 /**
+ * 
+ * Sets the default schema.
+ * 
+ * 
+ * Note: this method currently has no effect once the pool has been 
initialized. The pool is initialized the first
+ * time one of the following methods is invoked: getConnection, 
setLogwriter,
+ * setLoginTimeout, getLoginTimeout, getLogWriter.
+ * 
+ *
+ * @param defaultSchema
+ *the default catalog
+ * @since 2.5.0
+ */
+public void setDefaultSchema(final String defaultSchema) {
+if (defaultSchema != null && defaultSchema.trim().length() > 0) {
+this.defaultSchema = defaultSchema;
+} else 

svn commit: r1837746 [2/5] - in /tomcat/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ java/org/apache/tomca

[markt]

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java?rev=1837746&r1=1837745&r2=1837746&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java 
Thu Aug  9 16:50:30 2018
@@ -56,48 +56,6 @@ public class DelegatingDatabaseMetaData
 this.databaseMetaData = databaseMetaData;
 }
 
-/**
- * Gets the underlying database meta data.
- *
- * @return The underlying database meta data.
- */
-public DatabaseMetaData getDelegate() {
-return databaseMetaData;
-}
-
-/**
- * If my underlying {@link ResultSet} is not a {@code 
DelegatingResultSet}, returns it, otherwise recursively
- * invokes this method on my delegate.
- * 
- * Hence this method will return the first delegate that is not a {@code 
DelegatingResultSet}, or {@code null} when
- * no non-{@code DelegatingResultSet} delegate can be found by traversing 
this chain.
- * 
- * 
- * This method is useful when you may have nested {@code 
DelegatingResultSet}s, and you want to make sure to obtain
- * a "genuine" {@link ResultSet}.
- * 
- *
- * @return the innermost database meta data.
- */
-public DatabaseMetaData getInnermostDelegate() {
-DatabaseMetaData m = databaseMetaData;
-while (m != null && m instanceof DelegatingDatabaseMetaData) {
-m = ((DelegatingDatabaseMetaData) m).getDelegate();
-if (this == m) {
-return null;
-}
-}
-return m;
-}
-
-protected void handleException(final SQLException e) throws SQLException {
-if (connection != null) {
-connection.handleException(e);
-} else {
-throw e;
-}
-}
-
 @Override
 public boolean allProceduresAreCallable() throws SQLException {
 try {
@@ -119,6 +77,16 @@ public class DelegatingDatabaseMetaData
 }
 
 @Override
+public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
+try {
+return databaseMetaData.autoCommitFailureClosesAllResultSets();
+} catch (final SQLException e) {
+handleException(e);
+return false;
+}
+}
+
+@Override
 public boolean dataDefinitionCausesTransactionCommit() throws SQLException 
{
 try {
 return databaseMetaData.dataDefinitionCausesTransactionCommit();
@@ -159,6 +127,17 @@ public class DelegatingDatabaseMetaData
 }
 
 @Override
+public boolean generatedKeyAlwaysReturned() throws SQLException {
+connection.checkOpen();
+try {
+return databaseMetaData.generatedKeyAlwaysReturned();
+} catch (final SQLException e) {
+handleException(e);
+return false;
+}
+}
+
+@Override
 public ResultSet getAttributes(final String catalog, final String 
schemaPattern, final String typeNamePattern,
 final String attributeNamePattern) throws SQLException {
 connection.checkOpen();
@@ -185,6 +164,17 @@ public class DelegatingDatabaseMetaData
 }
 
 @Override
+public ResultSet getCatalogs() throws SQLException {
+connection.checkOpen();
+try {
+return DelegatingResultSet.wrapResultSet(connection, 
databaseMetaData.getCatalogs());
+} catch (final SQLException e) {
+handleException(e);
+throw new AssertionError();
+}
+}
+
+@Override
 public String getCatalogSeparator() throws SQLException {
 try {
 return databaseMetaData.getCatalogSeparator();
@@ -205,10 +195,10 @@ public class DelegatingDatabaseMetaData
 }
 
 @Override
-public ResultSet getCatalogs() throws SQLException {
+public ResultSet getClientInfoProperties() throws SQLException {
 connection.checkOpen();
 try {
-return DelegatingResultSet.wrapResultSet(connection, 
databaseMetaData.getCatalogs());
+return DelegatingResultSet.wrapResultSet(connection, 
databaseMetaData.getClientInfoProperties());
 } catch (final SQLException e) {
 handleException(e);
 throw new AssertionError();
@@ -309,6 +299,15 @@ public class DelegatingDatabaseMetaData
 }
 }
 
+/**
+ * Gets the underlying database meta data.
+ *
+ * @return The underlying database meta data.
+ */
+public DatabaseMetaData getDelegate() {
+return databaseMetaData;
+}
+
 @Override
 public int getDriverMajorVersion() {
 return databaseMetaData.getDriverMajorVersion();
@@ -363,6 +362,32 @@ public class Deleg

svn commit: r1837746 [4/5] - in /tomcat/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ java/org/apache/tomca

[markt]

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java?rev=1837746&r1=1837745&r2=1837746&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java Thu 
Aug  9 16:50:30 2018
@@ -42,6 +42,8 @@ public class DelegatingStatement extends
 /** The connection that created me. **/
 private DelegatingConnection connection;
 
+private boolean closed = false;
+
 /**
  * Create a wrapper for the Statement which traces this Statement to the 
Connection which created it and the code
  * which created it.
@@ -58,65 +60,60 @@ public class DelegatingStatement extends
 }
 
 /**
- * Returns my underlying {@link Statement}.
  *
- * @return my underlying {@link Statement}.
- * @see #getInnermostDelegate
+ * @throws SQLException
+ * thrown by the delegating statement.
+ * @since 2.4.0 made public, was protected in 2.3.0.
  */
-public Statement getDelegate() {
-return statement;
+public void activate() throws SQLException {
+if (statement instanceof DelegatingStatement) {
+((DelegatingStatement) statement).activate();
+}
 }
 
-/**
- * If my underlying {@link Statement} is not a {@code 
DelegatingStatement}, returns it, otherwise recursively
- * invokes this method on my delegate.
- * 
- * Hence this method will return the first delegate that is not a {@code 
DelegatingStatement} or {@code null} when
- * no non-{@code DelegatingStatement} delegate can be found by traversing 
this chain.
- * 
- * 
- * This method is useful when you may have nested {@code 
DelegatingStatement}s, and you want to make sure to obtain
- * a "genuine" {@link Statement}.
- * 
- *
- * @return The innermost delegate.
- *
- * @see #getDelegate
- */
-public Statement getInnermostDelegate() {
-Statement s = statement;
-while (s != null && s instanceof DelegatingStatement) {
-s = ((DelegatingStatement) s).getDelegate();
-if (this == s) {
-return null;
-}
+@Override
+public void addBatch(final String sql) throws SQLException {
+checkOpen();
+try {
+statement.addBatch(sql);
+} catch (final SQLException e) {
+handleException(e);
 }
-return s;
 }
 
-/**
- * Sets my delegate.
- *
- * @param statement
- *my delegate.
- */
-public void setDelegate(final Statement statement) {
-this.statement = statement;
+@Override
+public void cancel() throws SQLException {
+checkOpen();
+try {
+statement.cancel();
+} catch (final SQLException e) {
+handleException(e);
+}
 }
 
-private boolean closed = false;
-
-protected boolean isClosedInternal() {
-return closed;
+protected void checkOpen() throws SQLException {
+if (isClosed()) {
+throw new SQLException(this.getClass().getName() + " with address: 
\"" + this.toString() + "\" is closed.");
+}
 }
 
-protected void setClosedInternal(final boolean closed) {
-this.closed = closed;
+@Override
+public void clearBatch() throws SQLException {
+checkOpen();
+try {
+statement.clearBatch();
+} catch (final SQLException e) {
+handleException(e);
+}
 }
 
-protected void checkOpen() throws SQLException {
-if (isClosed()) {
-throw new SQLException(this.getClass().getName() + " with address: 
\"" + this.toString() + "\" is closed.");
+@Override
+public void clearWarnings() throws SQLException {
+checkOpen();
+try {
+statement.clearWarnings();
+} catch (final SQLException e) {
+handleException(e);
 }
 }
 
@@ -160,113 +157,169 @@ public class DelegatingStatement extends
 }
 }
 
-protected void handleException(final SQLException e) throws SQLException {
-if (connection != null) {
-connection.handleException(e);
-} else {
-throw e;
+@Override
+public void closeOnCompletion() throws SQLException {
+checkOpen();
+try {
+statement.closeOnCompletion();
+} catch (final SQLException e) {
+handleException(e);
 }
 }
 
-/**
- *
- * @throws SQLException
- * thrown by the delegating statement.
- * @since 2.4.0 made public, was protected in 2.3.0.
- */
-public void activate() throws SQLException {
-if (stat

svn commit: r1837746 [3/5] - in /tomcat/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ java/org/apache/tomca

[markt]

Modified: 
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java?rev=1837746&r1=1837745&r2=1837746&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java Thu 
Aug  9 16:50:30 2018
@@ -31,6 +31,7 @@ import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.RowId;
 import java.sql.SQLException;
+import java.sql.SQLType;
 import java.sql.SQLWarning;
 import java.sql.SQLXML;
 import java.sql.Statement;
@@ -54,33 +55,47 @@ import java.util.Map;
  */
 public final class DelegatingResultSet extends AbandonedTrace implements 
ResultSet {
 
-/** My delegate. **/
-private final ResultSet resultSet;
-
-/** The Statement that created me, if any. **/
-private Statement statement;
-
-/** The Connection that created me, if any. **/
-private Connection connection;
+/**
+ * Wraps the given result set in a delegate.
+ *
+ * @param connection
+ *The Connection which created the ResultSet.
+ * @param resultSet
+ *The ResultSet to wrap.
+ * @return a new delegate.
+ */
+public static ResultSet wrapResultSet(final Connection connection, final 
ResultSet resultSet) {
+if (null == resultSet) {
+return null;
+}
+return new DelegatingResultSet(connection, resultSet);
+}
 
 /**
- * Creates a wrapper for the ResultSet which traces this ResultSet to the 
Statement which created it and the code
- * which created it.
- * 
- * Private to ensure all construction is {@link #wrapResultSet(Statement, 
ResultSet)}
- * 
+ * Wraps the given result set in a delegate.
  *
  * @param statement
  *The Statement which created the ResultSet.
  * @param resultSet
  *The ResultSet to wrap.
+ * @return a new delegate.
  */
-private DelegatingResultSet(final Statement statement, final ResultSet 
resultSet) {
-super((AbandonedTrace) statement);
-this.statement = statement;
-this.resultSet = resultSet;
+public static ResultSet wrapResultSet(final Statement statement, final 
ResultSet resultSet) {
+if (null == resultSet) {
+return null;
+}
+return new DelegatingResultSet(statement, resultSet);
 }
 
+/** My delegate. **/
+private final ResultSet resultSet;
+
+/** The Statement that created me, if any. **/
+private Statement statement;
+
+/** The Connection that created me, if any. **/
+private Connection connection;
+
 /**
  * Creates a wrapper for the ResultSet which traces this ResultSet to the 
Connection which created it (via, for
  * example DatabaseMetadata, and the code which created it.
@@ -100,74 +115,67 @@ public final class DelegatingResultSet e
 }
 
 /**
- * Wraps the given result set in a delegate.
+ * Creates a wrapper for the ResultSet which traces this ResultSet to the 
Statement which created it and the code
+ * which created it.
+ * 
+ * Private to ensure all construction is {@link #wrapResultSet(Statement, 
ResultSet)}
+ * 
  *
  * @param statement
  *The Statement which created the ResultSet.
  * @param resultSet
  *The ResultSet to wrap.
- * @return a new delegate.
  */
-public static ResultSet wrapResultSet(final Statement statement, final 
ResultSet resultSet) {
-if (null == resultSet) {
-return null;
+private DelegatingResultSet(final Statement statement, final ResultSet 
resultSet) {
+super((AbandonedTrace) statement);
+this.statement = statement;
+this.resultSet = resultSet;
+}
+
+@Override
+public boolean absolute(final int row) throws SQLException {
+try {
+return resultSet.absolute(row);
+} catch (final SQLException e) {
+handleException(e);
+return false;
 }
-return new DelegatingResultSet(statement, resultSet);
 }
 
-/**
- * Wraps the given result set in a delegate.
- *
- * @param connection
- *The Connection which created the ResultSet.
- * @param resultSet
- *The ResultSet to wrap.
- * @return a new delegate.
- */
-public static ResultSet wrapResultSet(final Connection connection, final 
ResultSet resultSet) {
-if (null == resultSet) {
-return null;
+@Override
+public void afterLast() throws SQLException {
+try {
+resultSet.afterLast();
+} catch (final SQLException e) {
+handleException(e);
 }
-return new DelegatingR

svn commit: r1837746 [5/5] - in /tomcat/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ java/org/apache/tomca

[markt]

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java?rev=1837746&r1=1837745&r2=1837746&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java Thu 
Aug  9 16:50:30 2018
@@ -125,23 +125,7 @@ public class PoolingConnection extends D
  * @return the PStmtKey created for the given arguments.
  */
 protected PStmtKey createKey(final String sql) {
-String catalog = null;
-try {
-catalog = getCatalog();
-} catch (final SQLException e) {
-// Ignored
-}
-return new PStmtKey(normalizeSQL(sql), catalog);
-}
-
-protected PStmtKey createKey(final String sql, final int 
autoGeneratedKeys) {
-String catalog = null;
-try {
-catalog = getCatalog();
-} catch (final SQLException e) {
-// Ignored
-}
-return new PStmtKey(normalizeSQL(sql), catalog, autoGeneratedKeys);
+return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), 
getSchemaOrNull());
 }
 
 /**
@@ -155,13 +139,11 @@ public class PoolingConnection extends D
  * @return the PStmtKey created for the given arguments.
  */
 protected PStmtKey createKey(final String sql, final int columnIndexes[]) {
-String catalog = null;
-try {
-catalog = getCatalog();
-} catch (final SQLException e) {
-// Ignored
-}
-return new PStmtKey(normalizeSQL(sql), catalog, columnIndexes);
+return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), 
getSchemaOrNull(), columnIndexes);
+}
+
+protected PStmtKey createKey(final String sql, final int 
autoGeneratedKeys) {
+return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), 
getSchemaOrNull(), autoGeneratedKeys);
 }
 
 /**
@@ -177,13 +159,7 @@ public class PoolingConnection extends D
  * @return the PStmtKey created for the given arguments.
  */
 protected PStmtKey createKey(final String sql, final int resultSetType, 
final int resultSetConcurrency) {
-String catalog = null;
-try {
-catalog = getCatalog();
-} catch (final SQLException e) {
-// Ignored
-}
-return new PStmtKey(normalizeSQL(sql), catalog, resultSetType, 
resultSetConcurrency);
+return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), 
getSchemaOrNull(), resultSetType, resultSetConcurrency);
 }
 
 /**
@@ -202,13 +178,8 @@ public class PoolingConnection extends D
  */
 protected PStmtKey createKey(final String sql, final int resultSetType, 
final int resultSetConcurrency,
 final int resultSetHoldability) {
-String catalog = null;
-try {
-catalog = getCatalog();
-} catch (final SQLException e) {
-// Ignored
-}
-return new PStmtKey(normalizeSQL(sql), catalog, resultSetType, 
resultSetConcurrency, resultSetHoldability);
+return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), 
getSchemaOrNull(), resultSetType, resultSetConcurrency,
+resultSetHoldability);
 }
 
 /**
@@ -222,21 +193,15 @@ public class PoolingConnection extends D
  *result set concurrency
  * @param resultSetHoldability
  *result set holdability
- * @param stmtType
+ * @param statementType
  *statement type
  *
  * @return the PStmtKey created for the given arguments.
  */
 protected PStmtKey createKey(final String sql, final int resultSetType, 
final int resultSetConcurrency,
-final int resultSetHoldability, final StatementType stmtType) {
-String catalog = null;
-try {
-catalog = getCatalog();
-} catch (final SQLException e) {
-// Ignored
-}
-return new PStmtKey(normalizeSQL(sql), catalog, resultSetType, 
resultSetConcurrency, resultSetHoldability,
-stmtType);
+final int resultSetHoldability, final StatementType statementType) 
{
+return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), 
getSchemaOrNull(), resultSetType, resultSetConcurrency,
+resultSetHoldability, statementType);
 }
 
 /**
@@ -248,20 +213,14 @@ public class PoolingConnection extends D
  *result set type
  * @param resultSetConcurrency
  *result set concurrency
- * @param stmtType
+ * @param statementType
  *statement type
  *
  * @return the PStmtKey created for the given arguments.
  */
 protected PStmtKey createKey(final String sql, final int resultSetType, 
final int 

svn commit: r1837750 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/bcel/

[markt]

Author: markt
Date: Thu Aug  9 18:47:32 2018
New Revision: 1837750

URL: http://svn.apache.org/viewvc?rev=1837750&view=rev
Log:
Update BCEL (no changes)

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/bcel/   (props changed)

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 18:47:32 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,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,1747
 
404,1747506,1747536,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-1
 
756289,1756408-1756410,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-176205
 
3,1762123,1762168,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-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-176363

svn commit: r1837751 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/bcel/

[markt]

Author: markt
Date: Thu Aug  9 18:48:36 2018
New Revision: 1837751

URL: http://svn.apache.org/viewvc?rev=1837751&view=rev
Log:
Update BCEL (no changes)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 18:48:36 2018
@@ -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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165,1823341,1823490,1823493,1823498,1824299,1824313,1825715,1825874,1826367,1826379,1826690,1826830,1826874-1826875,1827864,1828

svn commit: r1837752 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/codec/

[markt]

Author: markt
Date: Thu Aug  9 18:49:53 2018
New Revision: 1837752

URL: http://svn.apache.org/viewvc?rev=1837752&view=rev
Log:
Update Codec (no changes)

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/codec/   (props changed)

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 18:49:53 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,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,1747
 
404,1747506,1747536,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-1
 
756289,1756408-1756410,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-176205
 
3,1762123,1762168,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-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763

svn commit: r1837753 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/codec/

[markt]

Author: markt
Date: Thu Aug  9 18:50:28 2018
New Revision: 1837753

URL: http://svn.apache.org/viewvc?rev=1837753&view=rev
Log:
Update Codec (no changes)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 18:50:28 2018
@@ -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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165,1823341,1823490,1823493,1823498,1824299,1824313,1825715,1825874,1826367,1826379,1826690,1826830,1826874-1826875,1827864,18

svn commit: r1837755 - in /tomcat/tc8.5.x/trunk: ./ MERGE.txt java/org/apache/tomcat/util/http/fileupload/ java/org/apache/tomcat/util/http/fileupload/MultipartStream.java

[markt]

Author: markt
Date: Thu Aug  9 18:52:21 2018
New Revision: 1837755

URL: http://svn.apache.org/viewvc?rev=1837755&view=rev
Log:
Update FileUpload
Most changes had already been applied (because we back-ported them to Commons 
after some local clean-up)

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/MERGE.txt
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/   (props 
changed)

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 18:52:21 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,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,1747
 
404,1747506,1747536,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-1
 
756289,1756408-1756410,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-176205
 
3,1762123,1762168,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,1

svn commit: r1837756 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/fileupload/ java/org/apache/tomcat/util/http/fileupload/MultipartStream.java

[markt]

Author: markt
Date: Thu Aug  9 18:53:49 2018
New Revision: 1837756

URL: http://svn.apache.org/viewvc?rev=1837756&view=rev
Log:
Update FileUpload
Most changes had already been applied (because we back-ported them to Commons 
after some local clean-up)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/   (props 
changed)

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 18:53:49 2018
@@ -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,1644525,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,1702
 
739,1702742,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,1
 
725974,1726171-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,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 
4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,18

svn commit: r1837757 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/dbcp/pool2/ java/org/apache/tomcat/dbcp/pool2/impl/ webapps/docs/

[markt]

Author: markt
Date: Thu Aug  9 18:56:34 2018
New Revision: 1837757

URL: http://svn.apache.org/viewvc?rev=1837757&view=rev
Log:
Update the internal fork of Apache Commons Pool 2 to 3e02523 (2018-08-09) to 
pick up some bug fixes and enhancements.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/MERGE.txt
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObject.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObjectFactory.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPoolMXBean.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/PoolImplUtils.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 18:56:34 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,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,1747
 
404,1747506,1747536,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-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,17

Re: DBCP2 in Tomcat

[Mark Thomas]

On 07/08/2018 09:47, Mark Thomas wrote:

On 07/08/18 09:42, jean-frederic clere wrote:

On 07/08/18 10:10, Mark Thomas wrote:

On 07/08/18 08:55, jean-frederic clere wrote:

Hi,

I just want to ask what is the process, we pick all changes after
commons-dbcp releases a version, or could I pick the actual code?


Generally, I keep an eye on DBCP2/Pool2 and pick up the changes from
master after I see an issue fixed I think might affect Tomcat users.

DBCP2 has recently added support for later JDBC versions so we may need
to be careful exactly which branch we pull from going forwards. I'd made
a mental note to figure out what we needed to do but hadn't got around
to it.


Someone is chasing me for DBCP-514, DBCP-515 and DBCP-516 that is why I
am asking.

commons-dbcp released 2.5.0 which doesn't have those fixes and we are
based on 2.4.0 in trunk.

So depending on your investigations we may or may not update to 2.6.0
once it is released, correct?


I think we'll update to 2.6.0. The question is what do we do if the
addition of the later JBDC methods causes us issues. I think we'll just
need to remove the @Override annotations. If that doesn't work (I can't
think why it wouldn't we'll need to remove some methods.

I'll make sure these updates make it into the next round of Tomcat releases.


9.0.x was fine and is updated to the latest DBCP code from master.

8.5.x is a little more tricky. The JDBC 4.2 (Java 8) changes were more 
problematic.
There were changes to Statement, Result etc. that could not be 
back-ported. Well, they could have been with a *lot* of reflection but 
it would have been pretty messy.


There was also a new class SQLType used in those methods that would have 
meant more reflection.


In the end, I opted to updated to the latest DBCP 2 code and then delete 
the problematic (JDBC 4.2) methods. If someone wants to explore the 
reflection route, it is trivial to do a diff between 9.0.x and 8.5.x, 
restore the deleted methods and then figure out a way to implement them 
that works for Java 7+.


Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1837759 [5/6] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ webapps/docs/

[markt]

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java?rev=1837759&r1=1837758&r2=1837759&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java 
Thu Aug  9 19:12:01 2018
@@ -42,6 +42,8 @@ public class DelegatingStatement extends
 /** The connection that created me. **/
 private DelegatingConnection connection;
 
+private boolean closed = false;
+
 /**
  * Create a wrapper for the Statement which traces this Statement to the 
Connection which created it and the code
  * which created it.
@@ -58,65 +60,60 @@ public class DelegatingStatement extends
 }
 
 /**
- * Returns my underlying {@link Statement}.
  *
- * @return my underlying {@link Statement}.
- * @see #getInnermostDelegate
+ * @throws SQLException
+ * thrown by the delegating statement.
+ * @since 2.4.0 made public, was protected in 2.3.0.
  */
-public Statement getDelegate() {
-return statement;
+public void activate() throws SQLException {
+if (statement instanceof DelegatingStatement) {
+((DelegatingStatement) statement).activate();
+}
 }
 
-/**
- * If my underlying {@link Statement} is not a {@code 
DelegatingStatement}, returns it, otherwise recursively
- * invokes this method on my delegate.
- * 
- * Hence this method will return the first delegate that is not a {@code 
DelegatingStatement} or {@code null} when
- * no non-{@code DelegatingStatement} delegate can be found by traversing 
this chain.
- * 
- * 
- * This method is useful when you may have nested {@code 
DelegatingStatement}s, and you want to make sure to obtain
- * a "genuine" {@link Statement}.
- * 
- *
- * @return The innermost delegate.
- *
- * @see #getDelegate
- */
-public Statement getInnermostDelegate() {
-Statement s = statement;
-while (s != null && s instanceof DelegatingStatement) {
-s = ((DelegatingStatement) s).getDelegate();
-if (this == s) {
-return null;
-}
+@Override
+public void addBatch(final String sql) throws SQLException {
+checkOpen();
+try {
+statement.addBatch(sql);
+} catch (final SQLException e) {
+handleException(e);
 }
-return s;
 }
 
-/**
- * Sets my delegate.
- *
- * @param statement
- *my delegate.
- */
-public void setDelegate(final Statement statement) {
-this.statement = statement;
+@Override
+public void cancel() throws SQLException {
+checkOpen();
+try {
+statement.cancel();
+} catch (final SQLException e) {
+handleException(e);
+}
 }
 
-private boolean closed = false;
-
-protected boolean isClosedInternal() {
-return closed;
+protected void checkOpen() throws SQLException {
+if (isClosed()) {
+throw new SQLException(this.getClass().getName() + " with address: 
\"" + this.toString() + "\" is closed.");
+}
 }
 
-protected void setClosedInternal(final boolean closed) {
-this.closed = closed;
+@Override
+public void clearBatch() throws SQLException {
+checkOpen();
+try {
+statement.clearBatch();
+} catch (final SQLException e) {
+handleException(e);
+}
 }
 
-protected void checkOpen() throws SQLException {
-if (isClosed()) {
-throw new SQLException(this.getClass().getName() + " with address: 
\"" + this.toString() + "\" is closed.");
+@Override
+public void clearWarnings() throws SQLException {
+checkOpen();
+try {
+statement.clearWarnings();
+} catch (final SQLException e) {
+handleException(e);
 }
 }
 
@@ -160,144 +157,106 @@ public class DelegatingStatement extends
 }
 }
 
-protected void handleException(final SQLException e) throws SQLException {
-if (connection != null) {
-connection.handleException(e);
-} else {
-throw e;
-}
-}
-
-/**
- *
- * @throws SQLException
- * thrown by the delegating statement.
- * @since 2.4.0 made public, was protected in 2.3.0.
- */
-public void activate() throws SQLException {
-if (statement instanceof DelegatingStatement) {
-((DelegatingStatement) statement).activate();
-}
-}
-
-/**
- *
- * @throws SQLException
- * thrown by t

svn commit: r1837759 [6/6] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ webapps/docs/

[markt]

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java?rev=1837759&r1=1837758&r2=1837759&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java 
Thu Aug  9 19:12:01 2018
@@ -125,23 +125,7 @@ public class PoolingConnection extends D
  * @return the PStmtKey created for the given arguments.
  */
 protected PStmtKey createKey(final String sql) {
-String catalog = null;
-try {
-catalog = getCatalog();
-} catch (final SQLException e) {
-// Ignored
-}
-return new PStmtKey(normalizeSQL(sql), catalog);
-}
-
-protected PStmtKey createKey(final String sql, final int 
autoGeneratedKeys) {
-String catalog = null;
-try {
-catalog = getCatalog();
-} catch (final SQLException e) {
-// Ignored
-}
-return new PStmtKey(normalizeSQL(sql), catalog, autoGeneratedKeys);
+return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), 
getSchemaOrNull());
 }
 
 /**
@@ -155,13 +139,11 @@ public class PoolingConnection extends D
  * @return the PStmtKey created for the given arguments.
  */
 protected PStmtKey createKey(final String sql, final int columnIndexes[]) {
-String catalog = null;
-try {
-catalog = getCatalog();
-} catch (final SQLException e) {
-// Ignored
-}
-return new PStmtKey(normalizeSQL(sql), catalog, columnIndexes);
+return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), 
getSchemaOrNull(), columnIndexes);
+}
+
+protected PStmtKey createKey(final String sql, final int 
autoGeneratedKeys) {
+return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), 
getSchemaOrNull(), autoGeneratedKeys);
 }
 
 /**
@@ -177,13 +159,7 @@ public class PoolingConnection extends D
  * @return the PStmtKey created for the given arguments.
  */
 protected PStmtKey createKey(final String sql, final int resultSetType, 
final int resultSetConcurrency) {
-String catalog = null;
-try {
-catalog = getCatalog();
-} catch (final SQLException e) {
-// Ignored
-}
-return new PStmtKey(normalizeSQL(sql), catalog, resultSetType, 
resultSetConcurrency);
+return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), 
getSchemaOrNull(), resultSetType, resultSetConcurrency);
 }
 
 /**
@@ -202,13 +178,8 @@ public class PoolingConnection extends D
  */
 protected PStmtKey createKey(final String sql, final int resultSetType, 
final int resultSetConcurrency,
 final int resultSetHoldability) {
-String catalog = null;
-try {
-catalog = getCatalog();
-} catch (final SQLException e) {
-// Ignored
-}
-return new PStmtKey(normalizeSQL(sql), catalog, resultSetType, 
resultSetConcurrency, resultSetHoldability);
+return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), 
getSchemaOrNull(), resultSetType, resultSetConcurrency,
+resultSetHoldability);
 }
 
 /**
@@ -222,21 +193,15 @@ public class PoolingConnection extends D
  *result set concurrency
  * @param resultSetHoldability
  *result set holdability
- * @param stmtType
+ * @param statementType
  *statement type
  *
  * @return the PStmtKey created for the given arguments.
  */
 protected PStmtKey createKey(final String sql, final int resultSetType, 
final int resultSetConcurrency,
-final int resultSetHoldability, final StatementType stmtType) {
-String catalog = null;
-try {
-catalog = getCatalog();
-} catch (final SQLException e) {
-// Ignored
-}
-return new PStmtKey(normalizeSQL(sql), catalog, resultSetType, 
resultSetConcurrency, resultSetHoldability,
-stmtType);
+final int resultSetHoldability, final StatementType statementType) 
{
+return new PStmtKey(normalizeSQL(sql), getCatalogOrNull(), 
getSchemaOrNull(), resultSetType, resultSetConcurrency,
+resultSetHoldability, statementType);
 }
 
 /**
@@ -248,20 +213,14 @@ public class PoolingConnection extends D
  *result set type
  * @param resultSetConcurrency
  *result set concurrency
- * @param stmtType
+ * @param statementType
  *statement type
  *
  * @return the PStmtKey created for the given arguments.
  */
 protected PStmtKey createKey(final String sql, f

svn commit: r1837759 [4/6] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ webapps/docs/

[markt]

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java?rev=1837759&r1=1837758&r2=1837759&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java 
(original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java 
Thu Aug  9 19:12:01 2018
@@ -54,33 +54,47 @@ import java.util.Map;
  */
 public final class DelegatingResultSet extends AbandonedTrace implements 
ResultSet {
 
-/** My delegate. **/
-private final ResultSet resultSet;
-
-/** The Statement that created me, if any. **/
-private Statement statement;
-
-/** The Connection that created me, if any. **/
-private Connection connection;
+/**
+ * Wraps the given result set in a delegate.
+ *
+ * @param connection
+ *The Connection which created the ResultSet.
+ * @param resultSet
+ *The ResultSet to wrap.
+ * @return a new delegate.
+ */
+public static ResultSet wrapResultSet(final Connection connection, final 
ResultSet resultSet) {
+if (null == resultSet) {
+return null;
+}
+return new DelegatingResultSet(connection, resultSet);
+}
 
 /**
- * Creates a wrapper for the ResultSet which traces this ResultSet to the 
Statement which created it and the code
- * which created it.
- * 
- * Private to ensure all construction is {@link #wrapResultSet(Statement, 
ResultSet)}
- * 
+ * Wraps the given result set in a delegate.
  *
  * @param statement
  *The Statement which created the ResultSet.
  * @param resultSet
  *The ResultSet to wrap.
+ * @return a new delegate.
  */
-private DelegatingResultSet(final Statement statement, final ResultSet 
resultSet) {
-super((AbandonedTrace) statement);
-this.statement = statement;
-this.resultSet = resultSet;
+public static ResultSet wrapResultSet(final Statement statement, final 
ResultSet resultSet) {
+if (null == resultSet) {
+return null;
+}
+return new DelegatingResultSet(statement, resultSet);
 }
 
+/** My delegate. **/
+private final ResultSet resultSet;
+
+/** The Statement that created me, if any. **/
+private Statement statement;
+
+/** The Connection that created me, if any. **/
+private Connection connection;
+
 /**
  * Creates a wrapper for the ResultSet which traces this ResultSet to the 
Connection which created it (via, for
  * example DatabaseMetadata, and the code which created it.
@@ -100,111 +114,27 @@ public final class DelegatingResultSet e
 }
 
 /**
- * Wraps the given result set in a delegate.
+ * Creates a wrapper for the ResultSet which traces this ResultSet to the 
Statement which created it and the code
+ * which created it.
+ * 
+ * Private to ensure all construction is {@link #wrapResultSet(Statement, 
ResultSet)}
+ * 
  *
  * @param statement
  *The Statement which created the ResultSet.
  * @param resultSet
  *The ResultSet to wrap.
- * @return a new delegate.
- */
-public static ResultSet wrapResultSet(final Statement statement, final 
ResultSet resultSet) {
-if (null == resultSet) {
-return null;
-}
-return new DelegatingResultSet(statement, resultSet);
-}
-
-/**
- * Wraps the given result set in a delegate.
- *
- * @param connection
- *The Connection which created the ResultSet.
- * @param resultSet
- *The ResultSet to wrap.
- * @return a new delegate.
- */
-public static ResultSet wrapResultSet(final Connection connection, final 
ResultSet resultSet) {
-if (null == resultSet) {
-return null;
-}
-return new DelegatingResultSet(connection, resultSet);
-}
-
-/**
- * Gets my delegate.
- *
- * @return my delegate.
- */
-public ResultSet getDelegate() {
-return resultSet;
-}
-
-/**
- * If my underlying {@link ResultSet} is not a {@code 
DelegatingResultSet}, returns it, otherwise recursively
- * invokes this method on my delegate.
- * 
- * Hence this method will return the first delegate that is not a {@code 
DelegatingResultSet}, or {@code null} when
- * no non-{@code DelegatingResultSet} delegate can be found by traversing 
this chain.
- * 
- * 
- * This method is useful when you may have nested {@code 
DelegatingResultSet}s, and you want to make sure to obtain
- * a "genuine" {@link ResultSet}.
- * 
- *
- * @return the innermost delegate.
- */
-public ResultSet getIn

svn commit: r1837759 [2/6] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ webapps/docs/

[markt]

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java?rev=1837759&r1=1837758&r2=1837759&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
 Thu Aug  9 19:12:01 2018
@@ -55,51 +55,55 @@ public class DelegatingCallableStatement
  * Creates a wrapper for the Statement which traces this Statement to the 
Connection which created it and the code
  * which created it.
  *
- * @param c
+ * @param connection
  *the {@link DelegatingConnection} that created this statement
- * @param s
+ * @param statement
  *the {@link CallableStatement} to delegate all calls to
  */
-public DelegatingCallableStatement(final DelegatingConnection c, final 
CallableStatement s) {
-super(c, s);
+public DelegatingCallableStatement(final DelegatingConnection 
connection, final CallableStatement statement) {
+super(connection, statement);
 }
 
 @Override
-public void registerOutParameter(final int parameterIndex, final int 
sqlType) throws SQLException {
+public Array getArray(final int parameterIndex) throws SQLException {
 checkOpen();
 try {
-
getDelegateCallableStatement().registerOutParameter(parameterIndex, sqlType);
+return getDelegateCallableStatement().getArray(parameterIndex);
 } catch (final SQLException e) {
 handleException(e);
+return null;
 }
 }
 
 @Override
-public void registerOutParameter(final int parameterIndex, final int 
sqlType, final int scale) throws SQLException {
+public Array getArray(final String parameterName) throws SQLException {
 checkOpen();
 try {
-
getDelegateCallableStatement().registerOutParameter(parameterIndex, sqlType, 
scale);
+return getDelegateCallableStatement().getArray(parameterName);
 } catch (final SQLException e) {
 handleException(e);
+return null;
 }
 }
 
 @Override
-public boolean wasNull() throws SQLException {
+public BigDecimal getBigDecimal(final int parameterIndex) throws 
SQLException {
 checkOpen();
 try {
-return getDelegateCallableStatement().wasNull();
+return 
getDelegateCallableStatement().getBigDecimal(parameterIndex);
 } catch (final SQLException e) {
 handleException(e);
-return false;
+return null;
 }
 }
 
+/** @deprecated Use {@link #getBigDecimal(int)} or {@link 
#getBigDecimal(String)} */
 @Override
-public String getString(final int parameterIndex) throws SQLException {
+@Deprecated
+public BigDecimal getBigDecimal(final int parameterIndex, final int scale) 
throws SQLException {
 checkOpen();
 try {
-return getDelegateCallableStatement().getString(parameterIndex);
+return 
getDelegateCallableStatement().getBigDecimal(parameterIndex, scale);
 } catch (final SQLException e) {
 handleException(e);
 return null;
@@ -107,65 +111,65 @@ public class DelegatingCallableStatement
 }
 
 @Override
-public boolean getBoolean(final int parameterIndex) throws SQLException {
+public BigDecimal getBigDecimal(final String parameterName) throws 
SQLException {
 checkOpen();
 try {
-return getDelegateCallableStatement().getBoolean(parameterIndex);
+return getDelegateCallableStatement().getBigDecimal(parameterName);
 } catch (final SQLException e) {
 handleException(e);
-return false;
+return null;
 }
 }
 
 @Override
-public byte getByte(final int parameterIndex) throws SQLException {
+public Blob getBlob(final int parameterIndex) throws SQLException {
 checkOpen();
 try {
-return getDelegateCallableStatement().getByte(parameterIndex);
+return getDelegateCallableStatement().getBlob(parameterIndex);
 } catch (final SQLException e) {
 handleException(e);
-return 0;
+return null;
 }
 }
 
 @Override
-public short getShort(final int parameterIndex) throws SQLException {
+public Blob getBlob(final String parameterName) throws SQLException {
 checkOpen();
 try {
-return getDelegateCallableStatement().getShort(parameterIndex);
+return getDelegateCallableStatement().getBlob(parameterName);
 } catch (final SQLException e) {
 handleExcepti

svn commit: r1837759 [1/6] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ webapps/docs/

[markt]

Author: markt
Date: Thu Aug  9 19:12:01 2018
New Revision: 1837759

URL: http://svn.apache.org/viewvc?rev=1837759&view=rev
Log:
Update the internal fork of Apache Commons DBCP 2 to abc0484 (2018-08-09) to 
pick up some bug fixes and enhancements.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/MERGE.txt
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/Utils.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 19:12:01 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,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,1747
 
404,1747506,1747536,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,1

svn commit: r1837759 [3/6] - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ java/org/apache/tomcat/dbcp/dbcp2/datasources/ webapps/docs/

[markt]

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java?rev=1837759&r1=1837758&r2=1837759&view=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingPreparedStatement.java
 Thu Aug  9 19:12:01 2018
@@ -64,414 +64,404 @@ public class DelegatingPreparedStatement
 }
 
 @Override
-public ResultSet executeQuery() throws SQLException {
+public void addBatch() throws SQLException {
 checkOpen();
-if (getConnectionInternal() != null) {
-getConnectionInternal().setLastUsed();
-}
 try {
-return DelegatingResultSet.wrapResultSet(this, 
getDelegatePreparedStatement().executeQuery());
+getDelegatePreparedStatement().addBatch();
 } catch (final SQLException e) {
 handleException(e);
-throw new AssertionError();
 }
 }
 
 @Override
-public int executeUpdate() throws SQLException {
+public void clearParameters() throws SQLException {
 checkOpen();
-if (getConnectionInternal() != null) {
-getConnectionInternal().setLastUsed();
-}
 try {
-return getDelegatePreparedStatement().executeUpdate();
+getDelegatePreparedStatement().clearParameters();
 } catch (final SQLException e) {
 handleException(e);
-return 0;
 }
 }
 
-private PreparedStatement getDelegatePreparedStatement() {
-return (PreparedStatement) getDelegate();
-}
-
 @Override
-public void setNull(final int parameterIndex, final int sqlType) throws 
SQLException {
+public boolean execute() throws SQLException {
 checkOpen();
+if (getConnectionInternal() != null) {
+getConnectionInternal().setLastUsed();
+}
 try {
-getDelegatePreparedStatement().setNull(parameterIndex, sqlType);
+return getDelegatePreparedStatement().execute();
 } catch (final SQLException e) {
 handleException(e);
+return false;
 }
 }
 
 @Override
-public void setBoolean(final int parameterIndex, final boolean x) throws 
SQLException {
+public ResultSet executeQuery() throws SQLException {
 checkOpen();
+if (getConnectionInternal() != null) {
+getConnectionInternal().setLastUsed();
+}
 try {
-getDelegatePreparedStatement().setBoolean(parameterIndex, x);
+return DelegatingResultSet.wrapResultSet(this, 
getDelegatePreparedStatement().executeQuery());
 } catch (final SQLException e) {
 handleException(e);
+throw new AssertionError();
 }
 }
 
 @Override
-public void setByte(final int parameterIndex, final byte x) throws 
SQLException {
+public int executeUpdate() throws SQLException {
 checkOpen();
+if (getConnectionInternal() != null) {
+getConnectionInternal().setLastUsed();
+}
 try {
-getDelegatePreparedStatement().setByte(parameterIndex, x);
+return getDelegatePreparedStatement().executeUpdate();
 } catch (final SQLException e) {
 handleException(e);
+return 0;
 }
 }
 
+private PreparedStatement getDelegatePreparedStatement() {
+return (PreparedStatement) getDelegate();
+}
+
 @Override
-public void setShort(final int parameterIndex, final short x) throws 
SQLException {
+public ResultSetMetaData getMetaData() throws SQLException {
 checkOpen();
 try {
-getDelegatePreparedStatement().setShort(parameterIndex, x);
+return getDelegatePreparedStatement().getMetaData();
 } catch (final SQLException e) {
 handleException(e);
+throw new AssertionError();
 }
 }
 
 @Override
-public void setInt(final int parameterIndex, final int x) throws 
SQLException {
+public java.sql.ParameterMetaData getParameterMetaData() throws 
SQLException {
 checkOpen();
 try {
-getDelegatePreparedStatement().setInt(parameterIndex, x);
+return getDelegatePreparedStatement().getParameterMetaData();
 } catch (final SQLException e) {
 handleException(e);
+throw new AssertionError();
 }
 }
 
 @Override
-public void setLong(final int parameterIndex, final long x) throws 
SQLException {
+public void setArray(final int i, final Array x) throws SQLException {
 checkOpen();
 try {
-getDelegatePreparedStatement

svn commit: r1837762 [4/4] - in /tomcat/site/trunk: docs/security-8.html docs/security-9.html xdocs/security-8.xml xdocs/security-9.xml

[markt]

Modified: tomcat/site/trunk/xdocs/security-8.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-8.xml?rev=1837762&r1=1837761&r2=1837762&view=diff
==
--- tomcat/site/trunk/xdocs/security-8.xml (original)
+++ tomcat/site/trunk/xdocs/security-8.xml Thu Aug  9 20:00:23 2018
@@ -83,14 +83,22 @@
 
   
   
-Important: Due to a mishandling of close in NIO/NIO2 connectors 
user
-   sessions can get mixed up
+Important: Information Disclosure
CVE-2018-8037
 
-A bug in the tracking of connection closures can lead to reuse of user
-   sessions in a new connection
+If an async request was completed by the application at the same time as
+   the container triggered the async timeout, a race condition existed that
+   could result in a user seeing a response intended for a different user.
+   An additional issue was present in the NIO and NIO2 connectors that did
+   not correctly track the closure of the connection when an async request
+   was completed by the application and timed out by the container at the
+   same time. This could also result in a user seeing a response intended
+   for another user.
 
-This was fixed in revision 1833907.
+This was fixed in revisions 1833826,
+   1833832,
+   1837531 and
+   1833907.
 
 This issue was reported to the Apache Tomcat Security Team by Dmitry
Treskunov on 16 June 2018 and made public on 22 July 2018.

Modified: tomcat/site/trunk/xdocs/security-9.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-9.xml?rev=1837762&r1=1837761&r2=1837762&view=diff
==
--- tomcat/site/trunk/xdocs/security-9.xml (original)
+++ tomcat/site/trunk/xdocs/security-9.xml Thu Aug  9 20:00:23 2018
@@ -65,14 +65,22 @@
 
 Affects: 9.0.0.M1 to 9.0.9
 
-Important: Due to a mishandling of close in NIO/NIO2 connectors 
user
-   sessions can get mixed up
+Important: Information Disclosure
CVE-2018-8037
 
-A bug in the tracking of connection closures can lead to reuse of user
-   sessions in a new connection
+If an async request was completed by the application at the same time as
+   the container triggered the async timeout, a race condition existed that
+   could result in a user seeing a response intended for a different user.
+   An additional issue was present in the NIO and NIO2 connectors that did
+   not correctly track the closure of the connection when an async request
+   was completed by the application and timed out by the container at the
+   same time. This could also result in a user seeing a response intended
+   for another user.
 
-This was fixed in revision 1833906.
+This was fixed in revisions 1833825,
+   1833831,
+   1837530 and
+   1833906.
 
 This issue was reported to the Apache Tomcat Security Team by Dmitry
Treskunov on 16 June 2018 and made public on 22 July 2018.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1837762 [1/4] - in /tomcat/site/trunk: docs/security-8.html docs/security-9.html xdocs/security-8.xml xdocs/security-9.xml

[markt]

Author: markt
Date: Thu Aug  9 20:00:23 2018
New Revision: 1837762

URL: http://svn.apache.org/viewvc?rev=1837762&view=rev
Log:
Update CVE-2018-8037

Modified:
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/xdocs/security-8.xml
tomcat/site/trunk/xdocs/security-9.xml


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1837762 [2/4] - in /tomcat/site/trunk: docs/security-8.html docs/security-9.html xdocs/security-8.xml xdocs/security-9.xml

[markt]

Modified: tomcat/site/trunk/docs/security-8.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1837762&r1=1837761&r2=1837762&view=diff
==
--- tomcat/site/trunk/docs/security-8.html (original)
+++ tomcat/site/trunk/docs/security-8.html Thu Aug  9 20:00:23 2018
@@ -1,356 +1,359 @@
 
 
-
-
-
-
-
-Apache Tomcat® - Apache Tomcat 8 vulnerabilities
-
-
-
-
-
-
-
-
-
-http://tomcat.apache.org/";>
-Apache Tomcat®
-
-
-https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apache.org/"; target="_blank" 
class="pull-left">
-
-
-
-
-
-
-
-https://www.google.com/search"; method="get">
-
-GO
-
-
-
-https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png";>
-
-
-
-Apache Tomcat
-
-
-Home
-
-
-Taglibs
-
-
-Maven Plugin
-
-
-
-
-TomcatCon
-
-
-North America
-
-
-
-
-Download
-
-
-Which version?
-
-
-https://tomcat.apache.org/download-90.cgi";>Tomcat 9
-
-
-https://tomcat.apache.org/download-80.cgi";>Tomcat 8
-
-
-https://tomcat.apache.org/download-70.cgi";>Tomcat 7
-
-
-https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectors
-
-
-https://tomcat.apache.org/download-native.cgi";>Tomcat Native
-
-
-https://tomcat.apache.org/download-taglibs.cgi";>Taglibs
-
-
-https://archive.apache.org/dist/tomcat/";>Archives
-
-
-
-
-Documentation
-
-
-Tomcat 9.0
-
-
-Tomcat 8.5
-
-
-Tomcat 8.0
-
-
-Tomcat 7.0
-
-
-Tomcat Connectors
-
-
-Tomcat Native
-
-
-https://wiki.apache.org/tomcat/FrontPage";>Wiki
-
-
-Migration Guide
-
-
-Presentations
-
-
-
-
-Problems?
-
-
-Security Reports
-
-
-Find help
-
-
-https://wiki.apache.org/tomcat/FAQ";>FAQ
-
-
-Mailing Lists
-
-
-Bug Database
-
-
-IRC
-
-
-
-
-Get Involved
-
-
-Overview
-
-
-Source code
-
-
-Buildbot
-
-
-Tools
-
-
-
-
-Media
-
-
-https://twitter.com/theapachetomcat";>Twitter
-
-
-https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube
-
-
-https://blogs.apache.org/tomcat/";>Blog
-
-
-
-
-Misc
-
-
-Who We Are
-
-
-Heritage
-
-
-http://www.apache.org";>Apache Home
-
-
-Resources
-
-
-Contact
-
-
-Legal
-
-
-https://www.apache.org/foundation/contributing.html";>Support 
Apache
-
-
-https://www.apache.org/foundation/sponsorship.html";>Sponsorship
-
-
-http://www.apache.org/foundation/thanks.html";>Thanks
-
-
-http://www.apache.org/licenses/";>License
-
-
-
-
-
-
-
-
-Content
-Table of Contents
-
-
-
-
-Apache Tomcat 8.x 
vulnerabilities
-
-
-Fixed in Apache Tomcat 8.0.53
-
-
-Fixed in Apache Tomcat 8.5.32
-
-
-Fixed in Apache Tomcat 8.0.52
-
-
-Fixed in Apache Tomcat 8.5.31
-
-
-Fixed in Apache Tomcat 8.0.50
-
-
-Fixed in Apache Tomcat 8.5.28
-
-
-Fixed in Apache Tomcat 8.0.48
-
-
-Fixed in Apache Tomcat 8.5.24
-
-
-Fixed in Apache Tomcat 8.0.47
-
-
-Fixed in Apache Tomcat 8.5.23
-
-
-Fixed in Apache Tomcat 8.0.45
-
-
-Fixed in Apache Tomcat 8.5.16
-
-
-Fixed in Apache Tomcat 8.0.44
-
-
-Fixed in Apache Tomcat 8.5.15
-
-
-Fixed in Apache Tomcat 8.0.43
-
-
-Fixed in Apache Tomcat 8.5.13
-
-
-Fixed in Apache Tomcat 8.0.42
-
-
-Fixed in Apache Tomcat 8.5.12
-
-
-Fixed in Apache Tomcat 8.0.41
-
-
-Fixed in Apache Tomcat 8.5.11
-
-
-Fixed in Apache Tomcat 8.5.9
-
-
-Fixed in Apache Tomcat 8.0.39
-
-
-Fixed in Apache Tomcat 8.5.8
-
-
-Fixed in Apache Tomcat 
8.5.5 and 8.0.37
-
-
-Fixed in Apache Tomcat 
8.5.3 and 8.0.36
-
-
-Fixed in Apache Tomcat 8.0.32
-
-
-Fixed in Apache Tomcat 8.0.30
-
-
-Fixed in Apache Tomcat 8.0.27
-
-
-Fixed in Apache Tomcat 8.0.17
-
-
-Fixed in Apache Tomcat 8.0.9
-
-
-Fixed in Apache Tomcat 8.0.8
-
-
-Fixed in Apache Tomcat 8.0.5
-
-
-Fixed in Apache Tomcat 8.0.3
-
-
-Fixed in Apache Tomcat 
8.0.0-RC10
-
-
-Fixed in Apache Tomcat 
8.0.0-RC3
-
-
-Not a vulnerability in Tomcat
-
-
-
-
-Apache Tomcat 8.x 
vulnerabilities
-
-
-This page lists all security vulnerabilities fixed in released versions
+
+
+
+
+
+Apache Tomcat® - Apache Tomcat 8 vulnerabilities
+
+
+
+
+
+
+
+
+
+http://tomcat.apache.org/";>
+
+Apache Tomcat®
+
+
+https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apache.org/"; target="_blank" 
class="pull-left">
+
+
+
+
+
+
+
+https://www.google.com/search"; 
method="get">
+
+GO
+  

svn commit: r1837762 [3/4] - in /tomcat/site/trunk: docs/security-8.html docs/security-9.html xdocs/security-8.xml xdocs/security-9.xml

[markt]

Modified: tomcat/site/trunk/docs/security-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1837762&r1=1837761&r2=1837762&view=diff
==
--- tomcat/site/trunk/docs/security-9.html (original)
+++ tomcat/site/trunk/docs/security-9.html Thu Aug  9 20:00:23 2018
@@ -1,296 +1,299 @@
 
 
-
-
-
-
-
-Apache Tomcat® - Apache Tomcat 9 vulnerabilities
-
-
-
-
-
-
-
-
-
-http://tomcat.apache.org/";>
-Apache Tomcat®
-
-
-https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apache.org/"; target="_blank" 
class="pull-left">
-
-
-
-
-
-
-
-https://www.google.com/search"; method="get">
-
-GO
-
-
-
-https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png";>
-
-
-
-Apache Tomcat
-
-
-Home
-
-
-Taglibs
-
-
-Maven Plugin
-
-
-
-
-TomcatCon
-
-
-North America
-
-
-
-
-Download
-
-
-Which version?
-
-
-https://tomcat.apache.org/download-90.cgi";>Tomcat 9
-
-
-https://tomcat.apache.org/download-80.cgi";>Tomcat 8
-
-
-https://tomcat.apache.org/download-70.cgi";>Tomcat 7
-
-
-https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectors
-
-
-https://tomcat.apache.org/download-native.cgi";>Tomcat Native
-
-
-https://tomcat.apache.org/download-taglibs.cgi";>Taglibs
-
-
-https://archive.apache.org/dist/tomcat/";>Archives
-
-
-
-
-Documentation
-
-
-Tomcat 9.0
-
-
-Tomcat 8.5
-
-
-Tomcat 8.0
-
-
-Tomcat 7.0
-
-
-Tomcat Connectors
-
-
-Tomcat Native
-
-
-https://wiki.apache.org/tomcat/FrontPage";>Wiki
-
-
-Migration Guide
-
-
-Presentations
-
-
-
-
-Problems?
-
-
-Security Reports
-
-
-Find help
-
-
-https://wiki.apache.org/tomcat/FAQ";>FAQ
-
-
-Mailing Lists
-
-
-Bug Database
-
-
-IRC
-
-
-
-
-Get Involved
-
-
-Overview
-
-
-Source code
-
-
-Buildbot
-
-
-Tools
-
-
-
-
-Media
-
-
-https://twitter.com/theapachetomcat";>Twitter
-
-
-https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube
-
-
-https://blogs.apache.org/tomcat/";>Blog
-
-
-
-
-Misc
-
-
-Who We Are
-
-
-Heritage
-
-
-http://www.apache.org";>Apache Home
-
-
-Resources
-
-
-Contact
-
-
-Legal
-
-
-https://www.apache.org/foundation/contributing.html";>Support 
Apache
-
-
-https://www.apache.org/foundation/sponsorship.html";>Sponsorship
-
-
-http://www.apache.org/foundation/thanks.html";>Thanks
-
-
-http://www.apache.org/licenses/";>License
-
-
-
-
-
-
-
-
-Content
-Table of Contents
-
-
-
-
-Apache Tomcat 9.x 
vulnerabilities
-
-
-Fixed in Apache Tomcat 9.0.10
-
-
-Fixed in Apache Tomcat 9.0.9
-
-
-Fixed in Apache Tomcat 9.0.8
-
-
-Fixed in Apache Tomcat 9.0.5
-
-
-Fixed in Apache Tomcat 9.0.2
-
-
-Fixed in Apache Tomcat 9.0.1
-
-
-Fixed in Apache Tomcat 
9.0.0.M22
-
-
-Fixed in Apache Tomcat 
9.0.0.M21
-
-
-Fixed in Apache Tomcat 
9.0.0.M19
-
-
-Fixed in Apache Tomcat 
9.0.0.M18
-
-
-Fixed in Apache Tomcat 
9.0.0.M17
-
-
-Fixed in Apache Tomcat 
9.0.0.M15
-
-
-Fixed in Apache Tomcat 
9.0.0.M13
-
-
-Fixed in Apache Tomcat 
9.0.0.M10
-
-
-Fixed in Apache Tomcat 9.0.0.M8
-
-
-Fixed in Apache Tomcat 9.0.0.M3
-
-
-
-
-Apache Tomcat 9.x 
vulnerabilities
-
-
-This page lists all security vulnerabilities fixed in released versions
+
+
+
+
+
+Apache Tomcat® - Apache Tomcat 9 vulnerabilities
+
+
+
+
+
+
+
+
+
+http://tomcat.apache.org/";>
+
+Apache Tomcat®
+
+
+https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apache.org/"; target="_blank" 
class="pull-left">
+
+
+
+
+
+
+
+https://www.google.com/search"; 
method="get">
+
+GO
+
+
+
+https://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png";>
+
+
+
+Apache Tomcat
+
+
+Home
+
+
+Taglibs
+
+

[UPDATE][SECURITY] CVE-2018-8037 Apache Tomcat - Information Disclosure

[Mark Thomas]

CVE-2018-8037 Apache Tomcat - Information Disclosure

Severity: Important

Vendor: The Apache Software Foundation

Versions Affected:
Apache Tomcat 9.0.0.M9 to 9.0.9
Apache Tomcat 8.5.5 to 8.5.31

Description:

If an async request was completed by the application at the same time as 
the container triggered the async timeout, a race condition existed that 
could result in a user seeing a response intended for a different user. 
An additional issue was present in the NIO and NIO2 connectors that did 
not correctly track the closure of the connection when an async request 
was completed by the application and timed out by the container at the 
same time. This could also result in a user seeing a response intended 
for another user.


Mitigation:
Users of the affected versions should apply one of the following
mitigations:
- Upgrade to Apache Tomcat 9.0.10 or later.
- Upgrade to Apache Tomcat 8.5.32 or later.

History:
2018-07-22 Original advisory
2018-08-09 Update description

References:
[1] http://tomcat.apache.org/security-9.html

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 62614] New: Async servlet over HTTP/2 WriteListener does not work because outputstream.write is hanging even it's ready

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=62614

Bug ID: 62614
   Summary: Async servlet over HTTP/2 WriteListener does not work
because outputstream.write is hanging even it's ready
   Product: Tomcat 9
   Version: 9.0.10
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Servlet
  Assignee: dev@tomcat.apache.org
  Reporter: zdap...@google.com
  Target Milestone: -

Steps to reproduce:

1. Enable HTTP/2 for Tomcat




2. Deploy the following Servlet

@WebServlet(urlPatterns = {"/asyncwrite"}, asyncSupported = true)
public class AsyncWrite extends HttpServlet {
  @Override
  protected void doGet(HttpServletRequest request, HttpServletResponse
response)
  throws IOException {
final AsyncContext asyncContext = request.startAsync();

response.setStatus(HttpServletResponse.SC_OK);
response.setContentType("application/binary");

final ServletOutputStream output = response.getOutputStream();
output.setWriteListener(new WriteListener() {
  int i;
  byte[] bytes = new byte[0x1];

  @Override
  public void onWritePossible() throws IOException {
i++;
System.out.println("onWritePossible called " + i + " times");

if (i > 3) {
  System.out.println("complete");
  asyncContext.complete();
  return;
}

while(output.isReady()) {
  output.write(bytes);
}

System.out.println("output.isReady() = " + false);
  }

  @Override
  public void onError(Throwable t) {
t.printStackTrace();
  }
});
  }
}

3. Make sure the curl command supports HTTP/2
$ curl --version
curl 7.60.0
Features: AsynchDNS IDN IPv6 Largefile GSS-API Kerberos SPNEGO NTLM NTLM_WB SSL
libz TLS-SRP HTTP2 UnixSockets HTTPS-proxy PSL

4. Run the following curl command over HTTP/1.1
$ curl "http://127.0.0.1:8080/asyncwrite"; -v --output - -w 'received
%{size_download} bytes\n'

No error happens. Check "logs/catalina.out" we can see

onWritePossible called 1 times
output.isReady() = false
onWritePossible called 2 times
output.isReady() = false
onWritePossible called 3 times
output.isReady() = false
onWritePossible called 4 times
complete

5. Run the following curl command over HTTP/2
$ curl  --http2 --http2-prior-knowledge  "http://127.0.0.1:8080/asyncwrite"; -v
--output - -w 'received %{size_download} bytes\n' 

The client hangs. Check "logs/catalina.out" we can only see

onWritePossible called 1 times

Actually output.write(bytes) is hanging.

-- 
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 62605] Async servlet over HTTP/2 setReadListener does not work if post request data arrives much later than headers

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=62605

--- Comment #3 from Dapeng Zhang  ---


(In reply to Mark Thomas from comment #1)
> Fixed. See also bug 61719.
> 
> Fixed in:
> - trunk for 9.0.11 onwards
> - 8.5.x for 8.5.33 onwards
> 
> Thanks for the test case. It make tracking down the root cause very simple.

Mark, thanks a lot for the fix. I verified the fix works. An new issue on
WriteListener over HTTP/2 is filed:
https://bz.apache.org/bugzilla/show_bug.cgi?id=62614

-- 
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 62615] New: WsSession leaks if java.net.SocketTimeoutException occurs after session.close()

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=62615

Bug ID: 62615
   Summary: WsSession leaks if  java.net.SocketTimeoutException
occurs after session.close()
   Product: Tomcat 8
   Version: 8.5.31
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: WebSocket
  Assignee: dev@tomcat.apache.org
  Reporter: 1005136...@qq.com
  Target Milestone: 

Created attachment 36083
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36083&action=edit
test code

1. Client --- debug a break point at WebSocketMessageHandler.onMessage:18 and
never resume
2. Server --- after about 18s, Thread Pool throw
java.util.concurrent.RejectedExecutionException
3. Server --- after about  20s, tomcat throw java.net.SocketTimeoutException
4. Client --- resume program log onClose
5. Server --- org.apache.tomcat.websocket.WsSession cannot be GC

-- 
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