Author: markt
Date: Wed Dec 6 10:49:16 2017
New Revision: 1817282
URL: http://svn.apache.org/viewvc?rev=1817282&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.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/MERGE.txt
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 6 10:49:16 2017
@@ -1,2 +1,2 @@
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687549,1687551,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701113,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,170
2886,1702910,1702923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,1703160,1703164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,1705842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710924,1710930,1710933,
1710945,1711006,1711016,1711022,1711026,1712163,1712225,1712228,1712233,1712250,1712254,1712489,1712547-1712548,1712588,1712617,1712645,1712654,1712695,1712765-1712766,1712771,1712775,1712859,1712876,1712898,1712902,1712905,1712912,1712974,1713129,1713168,1713184,1713285,1713362,1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715168,1715188,1715206,1715413,1715415,1715434,1715510-1715512,1715514-1715515,1715517-1715519,1715521,1715633,1715661,1715682,1715965,1716213-1716214,1716258,1716269,1716347,1716354,1716364,1716413,1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882,1716886,1716894,1717085,1717225,1717233,1717252,1717264,1717282,1717286,1717290,1717385,1717416,1717418,1717445,1717515,1717520,1717528,1717965,1717967-1717968,1717979,1718022,1718308,1718523,1718794,1718796,1718834,1718836-1718838,1719276,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,17194
46,1719488,1719909-1719910,1720200,1720234,1720394,1720439,1720445,1720448,1720462,1720506,1720652,1720654-1720655,1720711,1720752,1720769,1720776,1720804,1720815,1721303,1721307,1721311,1721314,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1721866,1721881,1721887,1722205,1722292,1722399,1722453,1722455,1722522,1722526,1722532,1722548,1722574,1722583,1722585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,1722923,1722939,1722945,1722996,1723068,1723127,1723155,1723250,1723316-1723318,1723368,1723371,1723375,1723377,1723380,1723410,1723414,1723437,1723484,1723486,1723493-1723494,1723500,1723552,1723554,1723683,1723707,1723736,1723806,1724012,1724232,1724252,1724325,1724427-1724428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1725165,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278,1725282,1725405,1725599,1725601,1725635,1725646,1725649-1725652,1725694,1725696-1725697,1725816,1725851,1725906-17
25907,1725910,1725914,1725920,1725926,1726177,1726202,1726628,1726632,1726637,1726639,1726648,1726651,1726654,1726669,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727899,1727914,1727917,1728091,1728138,1728433,1728448,1728664,1728677,1729185,1729361,1729625,1729730,1730101-1730102,1730137,1730612,1730946-1730975,1731008,1731055,1731079,1731283,1731856,1731882,1731946-1731958,1731976-1731983,1732359,1732488,1732900-1733448,1733602,1733617-1733963,1733978,1734113,1734128,1734192,1734258,1734301,1734418-1734454,1734466-1734512,1734522,1734592,1734594,1734597,1735041,1735577,1736162,1736209,1736280,1736646,1736836,1737119,1737280,1737339,1737632,1737664,1737715,1737834,1737903,1737959,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738643,1738850,1738982,1738996,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324
,1740465,1740509,1740520,1740535,1740707,1740803,1740810,1740980,1740991,1741015,1741147,1741173,1741181,1741190,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741677,1741892,1741896,1742071,1742090,1742093,1742101,1742105,1742111,1742146,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742919,1742975,1742984,1742986,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744760,1744786,1745227,1745337,1746306,1746427,1746473,1746620,1746649,1746724,1746939,1746989,1747536,1747924,1748001,1748547,1748629,1748715,1749287,1749328,1749665-1749666,1750015,1750056,1750899,1750975,1750995,1751061,1751097,1752212,1752737,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754
950-1754951,1755214,1755224,1755230,1755646-1755647,1755650,1755675,1755693,1755717,1755884,1755890,1755918-1755919,1755942,1756013,1756019,1756039,1756408,1756410,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757495,1757499,1757527,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758486-1758487,1758499,1758556,1758582,1758584,1758588,1758842,1759019,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761491,1761498,1761500-1761501,1761550,1761625-1761626,1761628,1761682,1761740,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762541,1762608,1762710,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276,1763319,1763370,1763372,1763375,1763377,1763393,1763412,1
763430,1763477,1763479,1763512,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1764083,1764659,1764682,1764897,1765299,1765358,1765439,1765571,1766276,1766514,1766822,1766834,1766840,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1768651,1768762,1768922,1769263,1770140,1770180,1770258,1770656,1770666,1770718,1770762,1771087,1771139,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771963,1772174,1772223,1772229,1772554,1772849,1772947,1773418,1773756,1773813-1773814,1774052,1774131,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1775596,1776540,1776937,1777011,1777173,1777211,1777261,1777524,1777605,1777647,1778061,1778138-1778139,1778141-1778150,1778154,1779654,1779718,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1781569,1781986,1782814,1782857,1782868,1782946,1783144,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784751,1784963,1785271,178566
7,1785762,1785774,1785823,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787250,1788224,1788241-1788242,1788248,1788323-1788324,1788328,1788741,1788747,1788764,1789051,1789400,1789415,1789442,1789733,1789735,1789744-1789745,1790119,1790180,1790183,1790376,1791027-1791028,1791050,1791527,1791557,1792460,1792468,1793468,1793487,1793498,1793502,1793514,1793712,1793736,1793746,1793771,1793819,1793980,1794674,1795278,1795298,1795305,1795813,1795893,1796275,1796693-1796694,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797678,1797692,1797694,1797748,1797828,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799285,1799368,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800791,1800816,1800981,1800984,1800988,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802403,1802475,1802490,1802639,1802796,1802820,180
2828,1802833,1802836,1803446,1803451,1803616,1803828,1803901,1804306,1804461-1804462,1804501,1804506-1804507,1804890,1804906,1805613,1805637,1805645,1805652,1805782,1806736,1806794,1806798,1806801,1806807,1806966,1806973,1807004,1807205-1807206,1807455,1807686,1807698,1808116,1808156,1808266,1809011,1809025,1809141,1809143-1809144,1809146,1809212,1809214,1809239,1809248,1809265,1809434,1809669,1809674,1809684,1809711,1809908,1809922,1810106,1810300,1811119,1811122,1811132,1811137,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811328,1811560,1811704,1811837-1811839,1811861,1811932,1812088,1812092,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812617,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815319,1815325,1815451,1815459,1815505,1815615,1815903,1815944,1815954,1816083,1816120,1816128,1816140,1816147,1816157,1816338,1816563,1816647,1817089,1817092,1817096,1817104,1817223
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687549,1687551,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701113,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,170
2886,1702910,1702923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,1703160,1703164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,1705842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710924,1710930,1710933,
1710945,1711006,1711016,1711022,1711026,1712163,1712225,1712228,1712233,1712250,1712254,1712489,1712547-1712548,1712588,1712617,1712645,1712654,1712695,1712765-1712766,1712771,1712775,1712859,1712876,1712898,1712902,1712905,1712912,1712974,1713129,1713168,1713184,1713285,1713362,1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715168,1715188,1715206,1715413,1715415,1715434,1715510-1715512,1715514-1715515,1715517-1715519,1715521,1715633,1715661,1715682,1715965,1716213-1716214,1716258,1716269,1716347,1716354,1716364,1716413,1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882,1716886,1716894,1717085,1717225,1717233,1717252,1717264,1717282,1717286,1717290,1717385,1717416,1717418,1717445,1717515,1717520,1717528,1717965,1717967-1717968,1717979,1718022,1718308,1718523,1718794,1718796,1718834,1718836-1718838,1719276,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,17194
46,1719488,1719909-1719910,1720200,1720234,1720394,1720439,1720445,1720448,1720462,1720506,1720652,1720654-1720655,1720711,1720752,1720769,1720776,1720804,1720815,1721303,1721307,1721311,1721314,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1721866,1721881,1721887,1722205,1722292,1722399,1722453,1722455,1722522,1722526,1722532,1722548,1722574,1722583,1722585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,1722923,1722939,1722945,1722996,1723068,1723127,1723155,1723250,1723316-1723318,1723368,1723371,1723375,1723377,1723380,1723410,1723414,1723437,1723484,1723486,1723493-1723494,1723500,1723552,1723554,1723683,1723707,1723736,1723806,1724012,1724232,1724252,1724325,1724427-1724428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1725165,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278,1725282,1725405,1725599,1725601,1725635,1725646,1725649-1725652,1725694,1725696-1725697,1725816,1725851,1725906-17
25907,1725910,1725914,1725920,1725926,1726177,1726202,1726628,1726632,1726637,1726639,1726648,1726651,1726654,1726669,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727899,1727914,1727917,1728091,1728138,1728433,1728448,1728664,1728677,1729185,1729361,1729625,1729730,1730101-1730102,1730137,1730612,1730946-1730975,1731008,1731055,1731079,1731283,1731856,1731882,1731946-1731958,1731976-1731983,1732359,1732488,1732900-1733448,1733602,1733617-1733963,1733978,1734113,1734128,1734192,1734258,1734301,1734418-1734454,1734466-1734512,1734522,1734592,1734594,1734597,1735041,1735577,1736162,1736209,1736280,1736646,1736836,1737119,1737280,1737339,1737632,1737664,1737715,1737834,1737903,1737959,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738643,1738850,1738982,1738996,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324
,1740465,1740509,1740520,1740535,1740707,1740803,1740810,1740980,1740991,1741015,1741147,1741173,1741181,1741190,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741677,1741892,1741896,1742071,1742090,1742093,1742101,1742105,1742111,1742146,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742919,1742975,1742984,1742986,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744760,1744786,1745227,1745337,1746306,1746427,1746473,1746620,1746649,1746724,1746939,1746989,1747536,1747924,1748001,1748547,1748629,1748715,1749287,1749328,1749665-1749666,1750015,1750056,1750899,1750975,1750995,1751061,1751097,1752212,1752737,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754
950-1754951,1755214,1755224,1755230,1755646-1755647,1755650,1755675,1755693,1755717,1755884,1755890,1755918-1755919,1755942,1756013,1756019,1756039,1756408,1756410,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757495,1757499,1757527,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758486-1758487,1758499,1758556,1758582,1758584,1758588,1758842,1759019,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761491,1761498,1761500-1761501,1761550,1761625-1761626,1761628,1761682,1761740,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762541,1762608,1762710,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276,1763319,1763370,1763372,1763375,1763377,1763393,1763412,1
763430,1763477,1763479,1763512,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1764083,1764659,1764682,1764897,1765299,1765358,1765439,1765571,1766276,1766514,1766822,1766834,1766840,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1768651,1768762,1768922,1769263,1770140,1770180,1770258,1770656,1770666,1770718,1770762,1771087,1771139,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771963,1772174,1772223,1772229,1772554,1772849,1772947,1773418,1773756,1773813-1773814,1774052,1774131,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1775596,1776540,1776937,1777011,1777173,1777211,1777261,1777524,1777605,1777647,1778061,1778138-1778139,1778141-1778150,1778154,1779654,1779718,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1781569,1781986,1782814,1782857,1782868,1782946,1783144,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784751,1784963,1785271,178566
7,1785762,1785774,1785823,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787250,1788224,1788241-1788242,1788248,1788323-1788324,1788328,1788741,1788747,1788764,1789051,1789400,1789415,1789442,1789733,1789735,1789744-1789745,1790119,1790180,1790183,1790376,1791027-1791028,1791050,1791527,1791557,1792460,1792468,1793468,1793487,1793498,1793502,1793514,1793712,1793736,1793746,1793771,1793819,1793980,1794674,1795278,1795298,1795305,1795813,1795893,1796275,1796693-1796694,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797678,1797692,1797694,1797748,1797828,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799285,1799368,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800791,1800816,1800981,1800984,1800988,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802403,1802475,1802490,1802639,1802796,1802820,180
2828,1802833,1802836,1803446,1803451,1803616,1803828,1803901,1804306,1804461-1804462,1804501,1804506-1804507,1804890,1804906,1805613,1805637,1805645,1805652,1805782,1806736,1806794,1806798,1806801,1806807,1806966,1806973,1807004,1807205-1807206,1807455,1807686,1807698,1808116,1808156,1808266,1809011,1809025,1809141,1809143-1809144,1809146,1809212,1809214,1809239,1809248,1809265,1809434,1809669,1809674,1809684,1809711,1809908,1809922,1810106,1810300,1811119,1811122,1811132,1811137,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811328,1811560,1811704,1811837-1811839,1811861,1811932,1812088,1812092,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812617,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815319,1815325,1815451,1815459,1815505,1815615,1815903,1815944,1815954,1816083,1816120,1816128,1816140,1816147,1816157,1816338,1816563,1816647,1817089,1817092,1817096,1817104,1817126,1817196,1817223
Modified: tomcat/tc8.0.x/trunk/MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/MERGE.txt?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/MERGE.txt (original)
+++ tomcat/tc8.0.x/trunk/MERGE.txt Wed Dec 6 10:49: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.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 6 10:49:16 2017
@@ -1,3 +1,3 @@
/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1694605,1725731-1757164
/commons/proper/dbcp/trunk/src/main/resources/org/apache/commons/dbcp2:1593516-1757164
-/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2:1682315,1682317,1694658,1695006,1743697,1757167,1772849,1811203,1811220
+/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2:1682315,1682317,1694658,1695006,1743697,1757167,1772849,1811203,1811220,1817126
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
Wed Dec 6 10:49: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
@@ -223,7 +223,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.
@@ -282,7 +282,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.
@@ -315,7 +315,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.
@@ -356,7 +356,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
@@ -1005,7 +1005,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.
@@ -1035,7 +1035,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.
@@ -1066,7 +1066,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.
@@ -1100,7 +1100,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
@@ -1310,7 +1310,7 @@ public class BasicDataSource implements
this.logExpiredConnections = logExpiredConnections;
}
- private String jmxName = null;
+ private String jmxName;
/**
* Returns the JMX name that has been requested for this DataSource. If the
@@ -1473,7 +1473,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;
@@ -1497,7 +1497,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.
@@ -1666,6 +1666,10 @@ public class BasicDataSource implements
}
abandonedConfig.setRemoveAbandonedOnMaintenance(
removeAbandonedOnMaintenance);
+ final GenericObjectPool<?> gop = this.connectionPool;
+ if (gop != null) {
+ gop.setAbandonedConfig(abandonedConfig);
+ }
}
/**
@@ -1698,6 +1702,10 @@ public class BasicDataSource implements
abandonedConfig = new AbandonedConfig();
}
abandonedConfig.setRemoveAbandonedOnBorrow(removeAbandonedOnBorrow);
+ final GenericObjectPool<?> gop = this.connectionPool;
+ if (gop != null) {
+ gop.setAbandonedConfig(abandonedConfig);
+ }
}
/**
@@ -1743,6 +1751,10 @@ public class BasicDataSource implements
abandonedConfig = new AbandonedConfig();
}
abandonedConfig.setRemoveAbandonedTimeout(removeAbandonedTimeout);
+ final GenericObjectPool<?> gop = this.connectionPool;
+ if (gop != null) {
+ gop.setAbandonedConfig(abandonedConfig);
+ }
}
/**
@@ -1771,6 +1783,10 @@ public class BasicDataSource implements
abandonedConfig = new AbandonedConfig();
}
abandonedConfig.setLogAbandoned(logAbandoned);
+ final GenericObjectPool<?> gop = this.connectionPool;
+ if (gop != null) {
+ gop.setAbandonedConfig(abandonedConfig);
+ }
}
/**
@@ -1795,6 +1811,10 @@ public class BasicDataSource implements
abandonedConfig = new AbandonedConfig();
}
abandonedConfig.setLogWriter(logWriter);
+ final GenericObjectPool<?> gop = this.connectionPool;
+ if (gop != null) {
+ gop.setAbandonedConfig(abandonedConfig);
+ }
}
/**
@@ -1828,6 +1848,10 @@ public class BasicDataSource implements
abandonedConfig = new AbandonedConfig();
}
abandonedConfig.setUseUsageTracking(usageTracking);
+ final GenericObjectPool<?> gop = this.connectionPool;
+ if (gop != null) {
+ gop.setAbandonedConfig(abandonedConfig);
+ }
}
// --------------------------------------------------------- Public Methods
@@ -2039,7 +2063,7 @@ public class BasicDataSource implements
driverConnectionFactory);
poolableConnectionFactory.setPoolStatements(
poolPreparedStatements);
- poolableConnectionFactory.setMaxOpenPrepatedStatements(
+ poolableConnectionFactory.setMaxOpenPreparedStatements(
maxOpenPreparedStatements);
success = true;
} catch (final SQLException se) {
@@ -2196,15 +2220,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);
@@ -2224,6 +2240,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() {
@@ -2280,7 +2319,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.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
Wed Dec 6 10:49: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.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
Wed Dec 6 10:49: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.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingStatement.java
Wed Dec 6 10:49: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.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java Wed
Dec 6 10:49: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.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
Wed Dec 6 10:49: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.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionFactory.java
Wed Dec 6 10:49:16 2017
@@ -157,7 +157,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;
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
Wed Dec 6 10:49:16 2017
@@ -200,26 +200,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;
@@ -294,6 +372,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.
*/
@@ -316,34 +465,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.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
Wed Dec 6 10:49: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.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
Wed Dec 6 10:49: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.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PStmtKeyCPDS.java
Wed Dec 6 10:49: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.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1817282&r1=1817281&r2=1817282&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Dec 6 10:49:16 2017
@@ -59,6 +59,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
