Author: markt
Date: Wed Dec 6 10:44:16 2017
New Revision: 1817281
URL: http://svn.apache.org/viewvc?rev=1817281&view=rev
Log:
Align packaged renamed DBCP2 with original.
Update the internal fork of Commons DBCP 2 to 8a71764 (2017-10-18)
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/DelegatingDatabaseMetaData.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/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/PoolingDataSource.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/res/findbugs/filter-false-positives.xml
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 6 10:44:16 2017
@@ -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-1763635,1763718,1763748,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,176
8283,1768520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-
1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,17885
50,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790213,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793716,1793719,1793736,1793746,1793758,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,17
95289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446
,1803451,1803456,1803459,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808482,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811
704,1811837-1811839,1811861,1811932,1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157,1816338,1816418,1816431,1816443,1816538,1816541,1816545,1816549-1816550,1816563,1816570,1816647,1816695-1816704,1816716,1816780,1816887,1817089,1817092,1817096,1817104,1817223
+/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-1763635,1763718,1763748,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,176
8283,1768520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-
1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,17885
50,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790213,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793716,1793719,1793736,1793746,1793758,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,17
95289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446
,1803451,1803456,1803459,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808482,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811
704,1811837-1811839,1811861,1811932,1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157,1816338,1816418,1816431,1816443,1816538,1816541,1816545,1816549-1816550,1816563,1816570,1816647,1816695-1816704,1816716,1816780,1816887,1817089,1817092,1817096,1817104,1817126,1817196,1817223
Modified: tomcat/tc8.5.x/trunk/MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/MERGE.txt?rev=1817281&r1=1817280&r2=1817281&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/MERGE.txt (original)
+++ tomcat/tc8.5.x/trunk/MERGE.txt Wed Dec 6 10:44:16 2017
@@ -32,24 +32,12 @@ merges. This file keeps track of these c
them up to date.
BCEL
+----
org.apache.tomcat.util.bcel is copied from:
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel
-DBCP (inc. Pool2)
-org.apache.tomcat.dbcp.dbcp2 is copied from:
-/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2
-and
-/commons/proper/dbcp/trunk/src/main/resources/org/apache/commons/dbcp2
-
-Pool2 used to be hosted in svn. All changes up to the point where Pool2 was
-migrated to git have been merged.
-
-
-FileUpload
-This used to be hosted in svn. All changes up to the point where FileUpload was
-migrated to git have been merged.
-
Codec
+-----
org.apache.tomcat.util.codec is copied from:
/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/
Note: Only classes required for Base64 encoding/decoding. The rest are removed.
@@ -65,6 +53,7 @@ The more recently merged SHA1 for the co
the patch file has been applied and committed
FileUpload
+----------
Sub-tree:
src/main/java/org/apache/commons/fileupload
The SHA1 ID for the most recent commit to be merged to Tomcat is:
@@ -73,6 +62,15 @@ The SHA1 ID for the most recent commit t
Note: Tomcat's copy of fileupload also includes classes copied manually (rather
than svn copied) from Commons IO.
+DBCP
+----
+DBCP2
+Sub-tree
+/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2
+/commons/proper/dbcp/trunk/src/main/resources/org/apache/commons/dbcp2
+The SHA1 ID for the most recent commit to be merged to Tomcat is:
+8a71764a895b234bd1fc76553835ef4c974f22e1
+
Pool2
Sub-tree
src/main/java/org/apache/commons/pool2
Propchange: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 6 10:44:16 2017
@@ -1,3 +1,3 @@
/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1757164
/commons/proper/dbcp/trunk/src/main/resources/org/apache/commons/dbcp2:1593516-1757164
-/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2:1743697,1757167,1772849,1811203,1811220
+/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2:1743697,1757167,1772849,1811203,1811220,1817126
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1817281&r1=1817280&r2=1817281&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
Wed Dec 6 10:44:16 2017
@@ -106,7 +106,7 @@ public class BasicDataSource implements
/**
* The default auto-commit state of connections created by this pool.
*/
- private volatile Boolean defaultAutoCommit = null;
+ private volatile Boolean defaultAutoCommit;
/**
* Returns the default auto-commit property.
@@ -137,7 +137,7 @@ public class BasicDataSource implements
/**
* The default read-only state of connections created by this pool.
*/
- private transient Boolean defaultReadOnly = null;
+ private transient Boolean defaultReadOnly;
/**
* Returns the default readOnly property.
@@ -198,7 +198,7 @@ public class BasicDataSource implements
}
- private Integer defaultQueryTimeout = null;
+ private Integer defaultQueryTimeout;
/**
* Obtain the default query timeout that will be used for {@link
java.sql.Statement Statement}s
@@ -225,7 +225,7 @@ public class BasicDataSource implements
/**
* The default "catalog" of connections created by this pool.
*/
- private volatile String defaultCatalog = null;
+ private volatile String defaultCatalog;
/**
* Returns the default catalog.
@@ -284,7 +284,7 @@ public class BasicDataSource implements
/**
* The instance of the JDBC Driver to use.
*/
- private Driver driver = null;
+ private Driver driver;
/**
* Returns the JDBC Driver that has been configured for use by this pool.
@@ -317,7 +317,7 @@ public class BasicDataSource implements
/**
* The fully qualified Java class name of the JDBC driver to be used.
*/
- private String driverClassName = null;
+ private String driverClassName;
/**
* Returns the JDBC driver class name.
@@ -358,7 +358,7 @@ public class BasicDataSource implements
* If specified, {@link Class#forName(String, boolean, ClassLoader)} is
* used.
*/
- private ClassLoader driverClassLoader = null;
+ private ClassLoader driverClassLoader;
/**
* Returns the class loader specified for loading the JDBC driver. Returns
@@ -1008,7 +1008,7 @@ public class BasicDataSource implements
* The connection password to be passed to our JDBC driver to establish
* a connection.
*/
- private volatile String password = null;
+ private volatile String password;
/**
* Returns the password passed to the JDBC driver to establish connections.
@@ -1038,7 +1038,7 @@ public class BasicDataSource implements
* The connection URL to be passed to our JDBC driver to establish
* a connection.
*/
- private String url = null;
+ private String url;
/**
* Returns the JDBC connection {@link #url} property.
@@ -1069,7 +1069,7 @@ public class BasicDataSource implements
* The connection username to be passed to our JDBC driver to
* establish a connection.
*/
- private String username = null;
+ private String username;
/**
* Returns the JDBC connection {@link #username} property.
@@ -1103,7 +1103,7 @@ public class BasicDataSource implements
* one row. If not specified, {@link Connection#isValid(int)} will be used
* to validate connections.
*/
- private volatile String validationQuery = null;
+ private volatile String validationQuery;
/**
* Returns the validation query used to validate connections before
@@ -1315,7 +1315,7 @@ public class BasicDataSource implements
this.logExpiredConnections = logExpiredConnections;
}
- private String jmxName = null;
+ private String jmxName;
/**
* @return the JMX name that has been requested for this DataSource. If the
@@ -1484,7 +1484,7 @@ public class BasicDataSource implements
/**
* The object pool that internally manages our connections.
*/
- private volatile GenericObjectPool<PoolableConnection> connectionPool =
null;
+ private volatile GenericObjectPool<PoolableConnection> connectionPool;
protected GenericObjectPool<PoolableConnection> getConnectionPool() {
return connectionPool;
@@ -1508,7 +1508,7 @@ public class BasicDataSource implements
* be acquired <strong>ONLY</strong> by calls to the
* <code>createDataSource()</code> method.
*/
- private volatile DataSource dataSource = null;
+ private volatile DataSource dataSource;
/**
* The PrintWriter to which log messages should be directed.
@@ -1677,6 +1677,10 @@ public class BasicDataSource implements
}
abandonedConfig.setRemoveAbandonedOnMaintenance(
removeAbandonedOnMaintenance);
+ final GenericObjectPool<?> gop = this.connectionPool;
+ if (gop != null) {
+ gop.setAbandonedConfig(abandonedConfig);
+ }
}
/**
@@ -1709,6 +1713,10 @@ public class BasicDataSource implements
abandonedConfig = new AbandonedConfig();
}
abandonedConfig.setRemoveAbandonedOnBorrow(removeAbandonedOnBorrow);
+ final GenericObjectPool<?> gop = this.connectionPool;
+ if (gop != null) {
+ gop.setAbandonedConfig(abandonedConfig);
+ }
}
/**
@@ -1754,6 +1762,10 @@ public class BasicDataSource implements
abandonedConfig = new AbandonedConfig();
}
abandonedConfig.setRemoveAbandonedTimeout(removeAbandonedTimeout);
+ final GenericObjectPool<?> gop = this.connectionPool;
+ if (gop != null) {
+ gop.setAbandonedConfig(abandonedConfig);
+ }
}
/**
@@ -1782,6 +1794,10 @@ public class BasicDataSource implements
abandonedConfig = new AbandonedConfig();
}
abandonedConfig.setLogAbandoned(logAbandoned);
+ final GenericObjectPool<?> gop = this.connectionPool;
+ if (gop != null) {
+ gop.setAbandonedConfig(abandonedConfig);
+ }
}
/**
@@ -1807,6 +1823,10 @@ public class BasicDataSource implements
abandonedConfig = new AbandonedConfig();
}
abandonedConfig.setLogWriter(logWriter);
+ final GenericObjectPool<?> gop = this.connectionPool;
+ if (gop != null) {
+ gop.setAbandonedConfig(abandonedConfig);
+ }
}
/**
@@ -1840,6 +1860,10 @@ public class BasicDataSource implements
abandonedConfig = new AbandonedConfig();
}
abandonedConfig.setUseUsageTracking(usageTracking);
+ final GenericObjectPool<?> gop = this.connectionPool;
+ if (gop != null) {
+ gop.setAbandonedConfig(abandonedConfig);
+ }
}
// --------------------------------------------------------- Public Methods
@@ -2044,7 +2068,7 @@ public class BasicDataSource implements
driverConnectionFactory);
poolableConnectionFactory.setPoolStatements(
poolPreparedStatements);
- poolableConnectionFactory.setMaxOpenPrepatedStatements(
+ poolableConnectionFactory.setMaxOpenPreparedStatements(
maxOpenPreparedStatements);
success = true;
} catch (final SQLException se) {
@@ -2204,15 +2228,7 @@ public class BasicDataSource implements
final GenericObjectPoolConfig config = new GenericObjectPoolConfig();
updateJmxName(config);
config.setJmxEnabled(registeredJmxName != null); // Disable JMX on
the underlying pool if the DS is not registered.
- GenericObjectPool<PoolableConnection> gop;
- if (abandonedConfig != null &&
- (abandonedConfig.getRemoveAbandonedOnBorrow() ||
- abandonedConfig.getRemoveAbandonedOnMaintenance())) {
- gop = new GenericObjectPool<>(factory, config, abandonedConfig);
- }
- else {
- gop = new GenericObjectPool<>(factory, config);
- }
+ final GenericObjectPool<PoolableConnection> gop =
createObjectPool(factory, config, abandonedConfig);
gop.setMaxTotal(maxTotal);
gop.setMaxIdle(maxIdle);
gop.setMinIdle(minIdle);
@@ -2232,6 +2248,29 @@ public class BasicDataSource implements
}
/**
+ * Creates an object pool used to provide pooling support for {@link
Connection JDBC connections}.
+ *
+ * @param factory the object factory
+ * @param poolConfig the object pool configuration
+ * @param abandonedConfig the abandoned objects configuration
+ * @return a non-null instance
+ */
+ protected GenericObjectPool<PoolableConnection> createObjectPool(
+ final PoolableConnectionFactory factory, final
GenericObjectPoolConfig poolConfig,
+ final AbandonedConfig abandonedConfig) {
+ GenericObjectPool<PoolableConnection> gop;
+ if (abandonedConfig != null &&
+ (abandonedConfig.getRemoveAbandonedOnBorrow() ||
+ abandonedConfig.getRemoveAbandonedOnMaintenance())) {
+ gop = new GenericObjectPool<>(factory, poolConfig,
abandonedConfig);
+ }
+ else {
+ gop = new GenericObjectPool<>(factory, poolConfig);
+ }
+ return gop;
+ }
+
+ /**
* Closes the connection pool, silently swallowing any exception that
occurs.
*/
private void closeConnectionPool() {
@@ -2289,7 +2328,7 @@ public class BasicDataSource implements
connectionFactory.setDefaultCatalog(defaultCatalog);
connectionFactory.setCacheState(cacheState);
connectionFactory.setPoolStatements(poolPreparedStatements);
-
connectionFactory.setMaxOpenPrepatedStatements(maxOpenPreparedStatements);
+
connectionFactory.setMaxOpenPreparedStatements(maxOpenPreparedStatements);
connectionFactory.setMaxConnLifetimeMillis(maxConnLifetimeMillis);
connectionFactory.setRollbackOnReturn(getRollbackOnReturn());
connectionFactory.setEnableAutoCommitOnReturn(getEnableAutoCommitOnReturn());
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java?rev=1817281&r1=1817280&r2=1817281&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
Wed Dec 6 10:44:16 2017
@@ -59,7 +59,7 @@ public class DelegatingDatabaseMetaData
* 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 transversing this chain.
+ * delegate can be found by traversing this chain.
* <p>
* This method is useful when you may have nested
* {@code DelegatingResultSet}s, and you want to make
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=1817281&r1=1817280&r2=1817281&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
Wed Dec 6 10:44:16 2017
@@ -128,7 +128,7 @@ public final class DelegatingResultSet e
* 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 transversing this chain.
+ * delegate can be found by traversing this chain.
* <p>
* This method is useful when you may have nested
* {@code DelegatingResultSet}s, and you want to make
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=1817281&r1=1817280&r2=1817281&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
Wed Dec 6 10:44:16 2017
@@ -81,7 +81,7 @@ public class DelegatingStatement extends
* 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 transversing this chain.
+ * delegate can be found by traversing this chain.
* <p>
* This method is useful when you may have nested
* {@code DelegatingStatement}s, and you want to make
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java?rev=1817281&r1=1817280&r2=1817281&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java Wed
Dec 6 10:44:16 2017
@@ -16,6 +16,12 @@
*/
package org.apache.tomcat.dbcp.dbcp2;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+
import org.apache.tomcat.dbcp.dbcp2.PoolingConnection.StatementType;
/**
@@ -33,22 +39,51 @@ public class PStmtKey {
/** Result set concurrency */
private final Integer _resultSetConcurrency;
+ /** Result set holdability */
+ private final Integer _resultSetHoldability;
+
/** Database catalog */
private final String _catalog;
/** Auto generated keys */
private final Integer _autoGeneratedKeys;
+ /** column indexes */
+ private final int[] _columnIndexes;
+
+ /** column names */
+ private final String[] _columnNames;
+
/** Statement type */
private final StatementType _stmtType;
+ /** Statement builder */
+ private StatementBuilder builder;
public PStmtKey(final String sql) {
- this(sql, null, StatementType.PREPARED_STATEMENT, null);
+ this(sql, null, StatementType.PREPARED_STATEMENT);
}
public PStmtKey(final String sql, final String catalog) {
- this(sql, catalog, StatementType.PREPARED_STATEMENT, null);
+ this(sql, catalog, StatementType.PREPARED_STATEMENT);
+ }
+
+ public PStmtKey(final String sql, final String catalog, final
StatementType stmtType) {
+ _sql = sql;
+ _catalog = catalog;
+ _stmtType = stmtType;
+ _autoGeneratedKeys = null;
+ _columnIndexes = null;
+ _columnNames = null;
+ _resultSetType = null;
+ _resultSetConcurrency = null;
+ _resultSetHoldability = null;
+ // create builder
+ if (stmtType == StatementType.PREPARED_STATEMENT) {
+ builder = new PreparedStatementSQL();
+ } else if (stmtType == StatementType.CALLABLE_STATEMENT) {
+ builder = new PreparedCallSQL();
+ }
}
public PStmtKey(final String sql, final String catalog, final int
autoGeneratedKeys) {
@@ -60,8 +95,45 @@ public class PStmtKey {
_catalog = catalog;
_stmtType = stmtType;
_autoGeneratedKeys = autoGeneratedKeys;
+ _columnIndexes = null;
+ _columnNames = null;
+ _resultSetType = null;
+ _resultSetConcurrency = null;
+ _resultSetHoldability = null;
+ // create builder
+ if (stmtType == StatementType.PREPARED_STATEMENT) {
+ builder = new PreparedStatementWithAutoGeneratedKeys();
+ } else if (stmtType == StatementType.CALLABLE_STATEMENT) {
+ builder = new PreparedCallSQL();
+ }
+ }
+
+ public PStmtKey(final String sql, final String catalog, final int[]
columnIndexes) {
+ _sql = sql;
+ _catalog = catalog;
+ _stmtType = StatementType.PREPARED_STATEMENT;
+ _autoGeneratedKeys = null;
+ _columnIndexes = columnIndexes;
+ _columnNames = null;
_resultSetType = null;
_resultSetConcurrency = null;
+ _resultSetHoldability = null;
+ // create builder
+ builder = new PreparedStatementWithColumnIndexes();
+ }
+
+ public PStmtKey(final String sql, final String catalog, final String[]
columnNames) {
+ _sql = sql;
+ _catalog = catalog;
+ _stmtType = StatementType.PREPARED_STATEMENT;
+ _autoGeneratedKeys = null;
+ _columnIndexes = null;
+ _columnNames = columnNames;
+ _resultSetType = null;
+ _resultSetConcurrency = null;
+ _resultSetHoldability = null;
+ // create builder
+ builder = new PreparedStatementWithColumnNames();
}
public PStmtKey(final String sql, final int resultSetType, final int
resultSetConcurrency) {
@@ -77,8 +149,41 @@ public class PStmtKey {
_catalog = catalog;
_resultSetType = Integer.valueOf(resultSetType);
_resultSetConcurrency = Integer.valueOf(resultSetConcurrency);
+ _resultSetHoldability = null;
_stmtType = stmtType;
_autoGeneratedKeys = null;
+ _columnIndexes = null;
+ _columnNames = null;
+ // create builder
+ if (stmtType == StatementType.PREPARED_STATEMENT) {
+ builder = new PreparedStatementWithResultSetConcurrency();
+ } else if (stmtType == StatementType.CALLABLE_STATEMENT) {
+ builder = new PreparedCallWithResultSetConcurrency();
+ }
+ }
+
+ public PStmtKey(final String sql, final String catalog, final int
resultSetType, final int resultSetConcurrency,
+ final int resultSetHoldability) {
+ this(sql, catalog, resultSetType, resultSetConcurrency,
resultSetHoldability, StatementType.PREPARED_STATEMENT);
+ }
+
+ public PStmtKey(final String sql, final String catalog, final int
resultSetType, final int resultSetConcurrency,
+ final int resultSetHoldability, final StatementType stmtType) {
+ _sql = sql;
+ _catalog = catalog;
+ _resultSetType = Integer.valueOf(resultSetType);
+ _resultSetConcurrency = Integer.valueOf(resultSetConcurrency);
+ _resultSetHoldability = Integer.valueOf(resultSetHoldability);
+ _stmtType = stmtType;
+ _autoGeneratedKeys = null;
+ _columnIndexes = null;
+ _columnNames = null;
+ // create builder
+ if (stmtType == StatementType.PREPARED_STATEMENT) {
+ builder = new PreparedStatementWithResultSetHoldability();
+ } else if (stmtType == StatementType.CALLABLE_STATEMENT) {
+ builder = new PreparedCallWithResultSetHoldability();
+ }
}
@@ -94,10 +199,22 @@ public class PStmtKey {
return _resultSetConcurrency;
}
+ public Integer getResultSetHoldability() {
+ return _resultSetHoldability;
+ }
+
public Integer getAutoGeneratedKeys() {
return _autoGeneratedKeys;
}
+ public int[] getColumnIndexes() {
+ return _columnIndexes;
+ }
+
+ public String[] getColumnNames() {
+ return _columnNames;
+ }
+
public String getCatalog() {
return _catalog;
}
@@ -139,6 +256,13 @@ public class PStmtKey {
} else if (!_resultSetType.equals(other._resultSetType)) {
return false;
}
+ if (_resultSetHoldability == null) {
+ if (other._resultSetHoldability != null) {
+ return false;
+ }
+ } else if (!_resultSetHoldability.equals(other._resultSetHoldability))
{
+ return false;
+ }
if (_autoGeneratedKeys == null) {
if (other._autoGeneratedKeys != null) {
return false;
@@ -146,6 +270,12 @@ public class PStmtKey {
} else if (!_autoGeneratedKeys.equals(other._autoGeneratedKeys)) {
return false;
}
+ if (!Arrays.equals(_columnIndexes, other._columnIndexes)) {
+ return false;
+ }
+ if (!Arrays.equals(_columnNames, other._columnNames)) {
+ return false;
+ }
if (_sql == null) {
if (other._sql != null) {
return false;
@@ -166,8 +296,11 @@ public class PStmtKey {
result = prime * result + (_catalog == null ? 0 : _catalog.hashCode());
result = prime * result + (_resultSetConcurrency == null ? 0 :
_resultSetConcurrency.hashCode());
result = prime * result + (_resultSetType == null ? 0 :
_resultSetType.hashCode());
+ result = prime * result + (_resultSetHoldability == null ? 0 :
_resultSetHoldability.hashCode());
result = prime * result + (_sql == null ? 0 : _sql.hashCode());
result = prime * result + (_autoGeneratedKeys == null ? 0 :
_autoGeneratedKeys.hashCode());
+ result = prime * result + Arrays.hashCode(_columnIndexes);
+ result = prime * result + Arrays.hashCode(_columnNames);
result = prime * result + _stmtType.hashCode();
return result;
}
@@ -183,10 +316,138 @@ public class PStmtKey {
buf.append(_resultSetType);
buf.append(", resultSetConcurrency=");
buf.append(_resultSetConcurrency);
+ buf.append(", resultSetHoldability=");
+ buf.append(_resultSetHoldability);
buf.append(", autoGeneratedKeys=");
buf.append(_autoGeneratedKeys);
- buf.append(", statmentType=");
+ buf.append(", columnIndexes=");
+ buf.append(Arrays.toString(_columnIndexes));
+ buf.append(", columnNames=");
+ buf.append(Arrays.toString(_columnNames));
+ buf.append(", statementType=");
buf.append(_stmtType);
return buf.toString();
}
+
+ public Statement createStatement(final Connection connection) throws
SQLException {
+ if (builder == null) {
+ throw new IllegalStateException("Prepared statement key is
invalid.");
+ }
+ return builder.createStatement(connection);
+ }
+
+ /**
+ * Interface for Prepared or Callable Statement
+ */
+ private interface StatementBuilder {
+ public Statement createStatement(Connection connection) throws
SQLException;
+ }
+
+ /**
+ * Builder for prepareStatement(String sql)
+ */
+ private class PreparedStatementSQL implements StatementBuilder {
+ @Override
+ public Statement createStatement(final Connection connection) throws
SQLException {
+ final PreparedStatement statement =
connection.prepareStatement(_sql);
+ return statement;
+ }
+ }
+
+ /**
+ * Builder for prepareStatement(String sql, int autoGeneratedKeys)
+ */
+ private class PreparedStatementWithAutoGeneratedKeys implements
StatementBuilder {
+ @Override
+ public Statement createStatement(final Connection connection) throws
SQLException {
+ final PreparedStatement statement = connection.prepareStatement(
+ _sql, _autoGeneratedKeys.intValue());
+ return statement;
+ }
+ }
+
+ /**
+ * Builder for prepareStatement(String sql, int[] columnIndexes)
+ */
+ private class PreparedStatementWithColumnIndexes implements
StatementBuilder {
+ @Override
+ public Statement createStatement(final Connection connection) throws
SQLException {
+ final PreparedStatement statement = connection.prepareStatement(
+ _sql, _columnIndexes);
+ return statement;
+ }
+ }
+
+ /**
+ * Builder for prepareStatement(String sql, int resultSetType, int
resultSetConcurrency)
+ */
+ private class PreparedStatementWithResultSetConcurrency implements
StatementBuilder {
+ @Override
+ public Statement createStatement(final Connection connection) throws
SQLException {
+ final PreparedStatement statement = connection.prepareStatement(
+ _sql, _resultSetType.intValue(),
_resultSetConcurrency.intValue());
+ return statement;
+ }
+ }
+
+ /**
+ * Builder for prepareStatement(String sql, int resultSetType, int
resultSetConcurrency, int resultSetHoldability)
+ */
+ private class PreparedStatementWithResultSetHoldability implements
StatementBuilder {
+ @Override
+ public Statement createStatement(final Connection connection) throws
SQLException {
+ final PreparedStatement statement = connection.prepareStatement(
+ _sql, _resultSetType.intValue(),
_resultSetConcurrency.intValue(),
+ _resultSetHoldability.intValue());
+ return statement;
+ }
+ }
+
+ /**
+ * Builder for prepareStatement(String sql, String[] columnNames)
+ */
+ private class PreparedStatementWithColumnNames implements StatementBuilder
{
+ @Override
+ public Statement createStatement(final Connection connection) throws
SQLException {
+ final PreparedStatement statement = connection.prepareStatement(
+ _sql, _columnNames);
+ return statement;
+ }
+ }
+
+ /**
+ * Builder for prepareCall(String sql)
+ */
+ private class PreparedCallSQL implements StatementBuilder {
+ @Override
+ public Statement createStatement(final Connection connection) throws
SQLException {
+ final PreparedStatement statement = connection.prepareCall(_sql);
+ return statement;
+ }
+ }
+
+ /**
+ * Builder for prepareCall(String sql, int resultSetType, int
resultSetConcurrency)
+ */
+ private class PreparedCallWithResultSetConcurrency implements
StatementBuilder {
+ @Override
+ public Statement createStatement(final Connection connection) throws
SQLException {
+ final PreparedStatement statement = connection.prepareCall(
+ _sql, _resultSetType.intValue(),
_resultSetConcurrency.intValue());
+ return statement;
+ }
+ }
+
+ /**
+ * Builder for prepareCall(String sql, int resultSetType, int
resultSetConcurrency, int resultSetHoldability)
+ */
+ private class PreparedCallWithResultSetHoldability implements
StatementBuilder {
+ @Override
+ public Statement createStatement(final Connection connection) throws
SQLException {
+ final PreparedStatement statement = connection.prepareCall(
+ _sql, _resultSetType.intValue(),
_resultSetConcurrency.intValue(),
+ _resultSetHoldability.intValue());
+ return statement;
+ }
+ }
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java?rev=1817281&r1=1817280&r2=1817281&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
Wed Dec 6 10:44:16 2017
@@ -164,9 +164,9 @@ public class PoolableConnection extends
return;
}
- boolean isUnderlyingConectionClosed;
+ boolean isUnderlyingConnectionClosed;
try {
- isUnderlyingConectionClosed = getDelegateInternal().isClosed();
+ isUnderlyingConnectionClosed = getDelegateInternal().isClosed();
} catch (final SQLException e) {
try {
_pool.invalidateObject(this);
@@ -186,7 +186,7 @@ public class PoolableConnection extends
* may have been borrowed by another thread. Therefore, the close flag
* is set in passivate().
*/
- if (isUnderlyingConectionClosed) {
+ if (isUnderlyingConnectionClosed) {
// Abnormal close: underlying connection closed unexpectedly, so we
// must destroy this proxy
try {
@@ -325,7 +325,8 @@ public class PoolableConnection extends
fatalException = _disconnectionSqlCodes == null ?
sqlState.startsWith(Utils.DISCONNECTION_SQL_CODE_PREFIX)
|| Utils.DISCONNECTION_SQL_CODES.contains(sqlState) :
_disconnectionSqlCodes.contains(sqlState);
if (!fatalException) {
- if (e.getNextException() != null) {
+ final SQLException nextException = e.getNextException();
+ if (nextException != null && nextException != e) {
fatalException =
isDisconnectionSqlException(e.getNextException());
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java?rev=1817281&r1=1817280&r2=1817281&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
Wed Dec 6 10:44:16 2017
@@ -158,7 +158,12 @@ public class PoolableConnectionFactory
this.poolStatements = poolStatements;
}
+ @Deprecated // Due to typo in method name.
public void setMaxOpenPrepatedStatements(final int
maxOpenPreparedStatements) {
+ setMaxOpenPreparedStatements(maxOpenPreparedStatements);
+ }
+
+ public void setMaxOpenPreparedStatements(final int
maxOpenPreparedStatements) {
this.maxOpenPreparedStatements = maxOpenPreparedStatements;
}
@@ -318,7 +323,7 @@ public class PoolableConnectionFactory
throw new SQLException("initializeConnection: connection closed");
}
if(null != sqls) {
- try (Statement stmt = conn.createStatement();) {
+ try (Statement stmt = conn.createStatement()) {
for (final String sql : sqls) {
if (sql == null) {
throw new NullPointerException(
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=1817281&r1=1817280&r2=1817281&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
Wed Dec 6 10:44:16 2017
@@ -203,26 +203,104 @@ public class PoolingConnection extends D
}
}
+ /**
+ * Create or obtain a {@link PreparedStatement} from the pool.
+ * @param sql the sql string used to define the PreparedStatement
+ * @param resultSetType result set type
+ * @param resultSetConcurrency result set concurrency
+ * @param resultSetHoldability result set holdability
+ * @return a {@link PoolablePreparedStatement}
+ */
+ @Override
+ public PreparedStatement prepareStatement(final String sql, final int
resultSetType,
+ final int resultSetConcurrency, final int resultSetHoldability)
throws SQLException {
+ if (null == _pstmtPool) {
+ throw new SQLException(
+ "Statement pool is null - closed or invalid
PoolingConnection.");
+ }
+ try {
+ return _pstmtPool.borrowObject(createKey(sql, resultSetType,
resultSetConcurrency, resultSetHoldability));
+ } catch(final NoSuchElementException e) {
+ throw new SQLException("MaxOpenPreparedStatements limit reached",
e);
+ } catch(final RuntimeException e) {
+ throw e;
+ } catch(final Exception e) {
+ throw new SQLException("Borrow prepareStatement from pool failed",
e);
+ }
+ }
-// TODO: possible enhancement, cache these preparedStatements as well
+ /**
+ * Create or obtain a {@link PreparedStatement} from the pool.
+ * @param sql the sql string used to define the PreparedStatement
+ * @param columnIndexes column indexes
+ * @return a {@link PoolablePreparedStatement}
+ */
+ @Override
+ public PreparedStatement prepareStatement(final String sql, final int
columnIndexes[])
+ throws SQLException {
+ if (null == _pstmtPool) {
+ throw new SQLException(
+ "Statement pool is null - closed or invalid
PoolingConnection.");
+ }
+ try {
+ return _pstmtPool.borrowObject(createKey(sql, columnIndexes));
+ } catch(final NoSuchElementException e) {
+ throw new SQLException("MaxOpenPreparedStatements limit reached",
e);
+ } catch(final RuntimeException e) {
+ throw e;
+ } catch(final Exception e) {
+ throw new SQLException("Borrow prepareStatement from pool failed",
e);
+ }
+ }
-// public PreparedStatement prepareStatement(String sql, int resultSetType,
-// int resultSetConcurrency,
-// int resultSetHoldability)
-// throws SQLException {
-// return super.prepareStatement(
-// sql, resultSetType, resultSetConcurrency, resultSetHoldability);
-// }
-//
-// public PreparedStatement prepareStatement(String sql, int
columnIndexes[])
-// throws SQLException {
-// return super.prepareStatement(sql, columnIndexes);
-// }
-//
-// public PreparedStatement prepareStatement(String sql, String
columnNames[])
-// throws SQLException {
-// return super.prepareStatement(sql, columnNames);
-// }
+ /**
+ * Create or obtain a {@link PreparedStatement} from the pool.
+ * @param sql the sql string used to define the PreparedStatement
+ * @param columnNames column names
+ * @return a {@link PoolablePreparedStatement}
+ */
+ @Override
+ public PreparedStatement prepareStatement(final String sql, final String
columnNames[])
+ throws SQLException {
+ if (null == _pstmtPool) {
+ throw new SQLException(
+ "Statement pool is null - closed or invalid
PoolingConnection.");
+ }
+ try {
+ return _pstmtPool.borrowObject(createKey(sql, columnNames));
+ } catch(final NoSuchElementException e) {
+ throw new SQLException("MaxOpenPreparedStatements limit reached",
e);
+ } catch(final RuntimeException e) {
+ throw e;
+ } catch(final Exception e) {
+ throw new SQLException("Borrow prepareStatement from pool failed",
e);
+ }
+ }
+
+ /**
+ * Create or obtain a {@link CallableStatement} from the pool.
+ * @param sql the sql string used to define the CallableStatement
+ * @param resultSetType result set type
+ * @param resultSetConcurrency result set concurrency
+ * @param resultSetHoldability result set holdability
+ * @return a {@link PoolableCallableStatement}
+ * @throws SQLException if a {@link CallableStatement} cannot be obtained
+ * from the pool
+ */
+ @Override
+ public CallableStatement prepareCall(final String sql, final int
resultSetType,
+ final int resultSetConcurrency, final int resultSetHoldability)
throws SQLException {
+ try {
+ return (CallableStatement) _pstmtPool.borrowObject(createKey(sql,
resultSetType,
+ resultSetConcurrency, resultSetHoldability,
StatementType.CALLABLE_STATEMENT));
+ } catch (final NoSuchElementException e) {
+ throw new SQLException("MaxOpenCallableStatements limit reached",
e);
+ } catch (final RuntimeException e) {
+ throw e;
+ } catch (final Exception e) {
+ throw new SQLException("Borrow callableStatement from pool
failed", e);
+ }
+ }
protected PStmtKey createKey(final String sql, final int
autoGeneratedKeys) {
String catalog = null;
@@ -301,6 +379,77 @@ public class PoolingConnection extends D
}
/**
+ * Create a PStmtKey for the given arguments.
+ * @param sql the sql string used to define the statement
+ * @param resultSetType result set type
+ * @param resultSetConcurrency result set concurrency
+ * @param resultSetHoldability result set holdability
+ * @return a newly created key for the given arguments
+ */
+ 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);
+ }
+
+ /**
+ * Create a PStmtKey for the given arguments.
+ * @param sql the sql string used to define the statement
+ * @param resultSetType result set type
+ * @param resultSetConcurrency result set concurrency
+ * @param resultSetHoldability result set holdability
+ * @param stmtType statement type
+ * @return a newly created key 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);
+ }
+
+ /**
+ * Create a PStmtKey for the given arguments.
+ * @param sql the sql string used to define the statement
+ * @param columnIndexes column indexes
+ * @return a newly created key 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);
+ }
+
+ /**
+ * Create a PStmtKey for the given arguments.
+ * @param sql the sql string used to define the statement
+ * @param columnNames column names
+ * @return a newly created key for the given arguments
+ */
+ protected PStmtKey createKey(final String sql, final String columnNames[])
{
+ String catalog = null;
+ try {
+ catalog = getCatalog();
+ } catch (final SQLException e) {
+ // Ignored
+ }
+ return new PStmtKey(normalizeSQL(sql), catalog, columnNames);
+ }
+
+ /**
* Normalize the given SQL statement, producing a
* canonical form that is semantically equivalent to the original.
* @param sql The SQL statement
@@ -327,34 +476,16 @@ public class PoolingConnection extends D
if(null == key) {
throw new IllegalArgumentException("Prepared statement key is null
or invalid.");
}
- if (null == key.getResultSetType() && null ==
key.getResultSetConcurrency() && null == key.getAutoGeneratedKeys()) {
- if (key.getStmtType() == StatementType.PREPARED_STATEMENT ) {
- @SuppressWarnings({"rawtypes", "unchecked"}) // Unable to find
way to avoid this
- final
- PoolablePreparedStatement pps = new PoolablePreparedStatement(
- getDelegate().prepareStatement(key.getSql()), key,
_pstmtPool, this);
- return new
DefaultPooledObject<DelegatingPreparedStatement>(pps);
- }
- return new DefaultPooledObject<DelegatingPreparedStatement>(
- new PoolableCallableStatement(getDelegate().prepareCall(
key.getSql()), key, _pstmtPool, this));
- } else if (null == key.getResultSetType() && null ==
key.getResultSetConcurrency()){
+ if (key.getStmtType() == StatementType.PREPARED_STATEMENT ) {
+ final PreparedStatement statement = (PreparedStatement)
key.createStatement(getDelegate());
@SuppressWarnings({"rawtypes", "unchecked"}) // Unable to find way
to avoid this
final
- PoolablePreparedStatement pps = new PoolablePreparedStatement(
- getDelegate().prepareStatement(key.getSql(),
key.getAutoGeneratedKeys().intValue()), key, _pstmtPool, this);
+ PoolablePreparedStatement pps = new
PoolablePreparedStatement(statement, key, _pstmtPool, this);
return new DefaultPooledObject<DelegatingPreparedStatement>(pps);
- } else { // Both _resultSetType and _resultSetConcurrency are non-null
here (both or neither are set by constructors)
- if(key.getStmtType() == StatementType.PREPARED_STATEMENT) {
- @SuppressWarnings({"rawtypes", "unchecked"}) // Unable to find
way to avoid this
- final
- PoolablePreparedStatement pps = new
PoolablePreparedStatement(getDelegate().prepareStatement(
- key.getSql(),
key.getResultSetType().intValue(),key.getResultSetConcurrency().intValue()),
key, _pstmtPool, this);
- return new
DefaultPooledObject<DelegatingPreparedStatement>(pps);
- }
- return new DefaultPooledObject<DelegatingPreparedStatement>(
- new PoolableCallableStatement( getDelegate().prepareCall(
- key.getSql(),key.getResultSetType().intValue(),
key.getResultSetConcurrency().intValue()), key, _pstmtPool, this));
}
+ final CallableStatement statement = (CallableStatement)
key.createStatement(getDelegate());
+ final PoolableCallableStatement pcs = new
PoolableCallableStatement(statement, key, _pstmtPool, this);
+ return new DefaultPooledObject<DelegatingPreparedStatement>(pcs);
}
/**
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java?rev=1817281&r1=1817280&r2=1817281&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
Wed Dec 6 10:44:16 2017
@@ -142,6 +142,10 @@ public class PoolingDataSource<C extends
throw new SQLException("Cannot get a connection, pool error " +
e.getMessage(), e);
} catch(final RuntimeException e) {
throw e;
+ } catch(final InterruptedException e) {
+ // Reset the interrupt status so it is visible to callers
+ Thread.currentThread().interrupt();
+ throw new SQLException("Cannot get a connection, general error",
e);
} catch(final Exception e) {
throw new SQLException("Cannot get a connection, general error",
e);
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1817281&r1=1817280&r2=1817281&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
Wed Dec 6 10:44:16 2017
@@ -70,7 +70,7 @@ import org.apache.tomcat.dbcp.pool2.impl
*
* <p>
* The DriverAdapterCPDS also provides <code>PreparedStatement</code> pooling
- * which is not generally available in jbdc2
+ * which is not generally available in jdbc2
* <code>ConnectionPoolDataSource</code> implementation, but is
* addressed within the jdbc3 specification. The
<code>PreparedStatement</code>
* pool in DriverAdapterCPDS has been in the dbcp package for some time, but
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java?rev=1817281&r1=1817280&r2=1817281&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java
Wed Dec 6 10:44:16 2017
@@ -124,7 +124,7 @@ public class PStmtKeyCPDS extends PStmtK
buf.append(getResultSetType());
buf.append(", resultSetConcurrency=");
buf.append(getResultSetConcurrency());
- buf.append(", statmentType=");
+ buf.append(", statementType=");
buf.append(getStmtType());
buf.append(", resultSetHoldability=");
buf.append(_resultSetHoldability);
Modified: tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml?rev=1817281&r1=1817280&r2=1817281&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/tc8.5.x/trunk/res/findbugs/filter-false-positives.xml Wed Dec 6
10:44:16 2017
@@ -698,8 +698,15 @@
</Match>
<Match>
<!-- SQL construction is necessary for pooled statements -->
- <Class name="org.apache.tomcat.dbcp.dbcp2.PoolingConnection" />
- <Method name="makeObject" />
+ <Or>
+ <Class name="org.apache.tomcat.dbcp.dbcp2.PStmtKey$PreparedStatementSQL"
/>
+ <Class
name="org.apache.tomcat.dbcp.dbcp2.PStmtKey$PreparedStatementWithAutoGeneratedKeys"
/>
+ <Class
name="org.apache.tomcat.dbcp.dbcp2.PStmtKey$PreparedStatementWithColumnIndexes"
/>
+ <Class
name="org.apache.tomcat.dbcp.dbcp2.PStmtKey$PreparedStatementWithColumnNames" />
+ <Class
name="org.apache.tomcat.dbcp.dbcp2.PStmtKey$PreparedStatementWithResultSetConcurrency"
/>
+ <Class
name="org.apache.tomcat.dbcp.dbcp2.PStmtKey$PreparedStatementWithResultSetHoldability"
/>
+ </Or>
+ <Method name="createStatement" />
<Bug pattern="SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING" />
</Match>
<Match>
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1817281&r1=1817280&r2=1817281&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Dec 6 10:44:16 2017
@@ -94,6 +94,10 @@
<update>
Update the internal fork of Commons Pool 2 to 2.4.3. (markt)
</update>
+ <update>
+ Update the internal fork of Commons DBCP 2 to 8a71764 (2017-10-18) to
+ pick up some bug fixes and enhancements. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
