You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/05/13 19:03:42 UTC
svn commit: r1743727 [1/8] - in /tomcat/tc8.0.x/trunk: ./
java/org/apache/tomcat/dbcp/dbcp2/
java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/
java/org/apache/tomcat/dbcp/dbcp2/datasources/ webapps/docs/
Author: markt
Date: Fri May 13 19:03:42 2016
New Revision: 1743727
URL: http://svn.apache.org/viewvc?rev=1743727&view=rev
Log:
Update internal fork of Commons DBCP 2
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DataSourceConnectionFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.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/DelegatingPreparedStatement.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/DriverConnectionFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/LifetimeExceededException.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/PoolableCallableStatement.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/PoolablePreparedStatement.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/PoolingDriver.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/Utils.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/ConnectionImpl.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/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/PooledConnectionImpl.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/package-info.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/CPDSConnectionFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSource.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/InstanceKeyDataSourceFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/KeyedCPDSConnectionFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PoolKey.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionAndInfo.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSource.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/datasources/UserPassKey.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 19:03:42 2016
@@ -1,2 +1,2 @@
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140
-/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,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,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,1702886,1702910,170
2923,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,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,1719446,1719488,1719909-17199
10,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,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-1725907,1725910,1725914,1725920,17
25926,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,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,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,1742448,1742919,1742975,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696
+/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,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,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,1702886,1702910,170
2923,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,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,1719446,1719488,1719909-17199
10,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,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-1725907,1725910,1725914,1725920,17
25926,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,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,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,1742448,1742919,1742975,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697
Propchange: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 19:03:42 2016
@@ -1,2 +1,3 @@
-/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1694605
-/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2:1682315,1682317,1694658,1695006
+/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:1593516-1694605,1725731-1743696
+/commons/proper/dbcp/trunk/src/main/resources/org/apache/commons/dbcp2:1593516-1743696
+/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2:1682315,1682317,1694658,1695006,1743697
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java?rev=1743727&r1=1743726&r2=1743727&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java Fri May 13 19:03:42 2016
@@ -54,7 +54,7 @@ public class AbandonedTrace implements T
*
* @param parent AbandonedTrace parent object
*/
- public AbandonedTrace(AbandonedTrace parent) {
+ public AbandonedTrace(final AbandonedTrace parent) {
init(parent);
}
@@ -63,7 +63,7 @@ public class AbandonedTrace implements T
*
* @param parent AbandonedTrace parent object
*/
- private void init(AbandonedTrace parent) {
+ private void init(final AbandonedTrace parent) {
if (parent != null) {
parent.addTrace(this);
}
@@ -92,7 +92,7 @@ public class AbandonedTrace implements T
*
* @param time time in ms
*/
- protected void setLastUsed(long time) {
+ protected void setLastUsed(final long time) {
lastUsed = time;
}
@@ -102,7 +102,7 @@ public class AbandonedTrace implements T
*
* @param trace AbandonedTrace object to add
*/
- protected void addTrace(AbandonedTrace trace) {
+ protected void addTrace(final AbandonedTrace trace) {
synchronized (this.traceList) {
this.traceList.add(new WeakReference<>(trace));
}
@@ -125,15 +125,15 @@ public class AbandonedTrace implements T
* @return List of objects
*/
protected List<AbandonedTrace> getTrace() {
- int size = traceList.size();
+ final int size = traceList.size();
if (size == 0) {
return Collections.emptyList();
}
- ArrayList<AbandonedTrace> result = new ArrayList<>(size);
+ final ArrayList<AbandonedTrace> result = new ArrayList<>(size);
synchronized (this.traceList) {
- Iterator<WeakReference<AbandonedTrace>> iter = traceList.iterator();
+ final Iterator<WeakReference<AbandonedTrace>> iter = traceList.iterator();
while (iter.hasNext()) {
- WeakReference<AbandonedTrace> ref = iter.next();
+ final WeakReference<AbandonedTrace> ref = iter.next();
if (ref.get() == null) {
// Clean-up since we are here anyway
iter.remove();
@@ -150,11 +150,11 @@ public class AbandonedTrace implements T
*
* @param trace AbandonedTrace object to remove
*/
- protected void removeTrace(AbandonedTrace trace) {
+ protected void removeTrace(final AbandonedTrace trace) {
synchronized(this.traceList) {
- Iterator<WeakReference<AbandonedTrace>> iter = traceList.iterator();
+ final Iterator<WeakReference<AbandonedTrace>> iter = traceList.iterator();
while (iter.hasNext()) {
- WeakReference<AbandonedTrace> ref = iter.next();
+ final WeakReference<AbandonedTrace> ref = iter.next();
if (trace.equals(ref.get())) {
iter.remove();
break;
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=1743727&r1=1743726&r2=1743727&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 Fri May 13 19:03:42 2016
@@ -59,7 +59,7 @@ import org.apache.tomcat.dbcp.pool2.impl
/**
* <p>Basic implementation of <code>javax.sql.DataSource</code> that is
* configured via JavaBeans properties. This is not the only way to
- * combine the <em>commons-dbcp</em> and <em>commons-pool</em> packages,
+ * combine the <em>commons-dbcp2</em> and <em>commons-pool2</em> packages,
* but provides a "one stop shopping" solution for basic requirements.</p>
*
* @author Glenn L. Nielsen
@@ -80,8 +80,8 @@ public class BasicDataSource implements
// but the following classes are not loaded and therefore require
// explicit loading.
if (Utils.IS_SECURITY_ENABLED) {
- ClassLoader loader = BasicDataSource.class.getClassLoader();
- String dbcpPackageName = BasicDataSource.class.getPackage().getName();
+ final ClassLoader loader = BasicDataSource.class.getClassLoader();
+ final String dbcpPackageName = BasicDataSource.class.getPackage().getName();
loader.loadClass(dbcpPackageName + ".BasicDataSource$PaGetConnection");
loader.loadClass(dbcpPackageName + ".DelegatingCallableStatement");
loader.loadClass(dbcpPackageName + ".DelegatingDatabaseMetaData");
@@ -92,11 +92,11 @@ public class BasicDataSource implements
loader.loadClass(dbcpPackageName + ".PoolingConnection$StatementType");
loader.loadClass(dbcpPackageName + ".PStmtKey");
- String poolPackageName = PooledObject.class.getPackage().getName();
+ final String poolPackageName = PooledObject.class.getPackage().getName();
loader.loadClass(poolPackageName + ".impl.LinkedBlockingDeque$Node");
loader.loadClass(poolPackageName + ".impl.GenericKeyedObjectPool$ObjectDeque");
}
- } catch (ClassNotFoundException cnfe) {
+ } catch (final ClassNotFoundException cnfe) {
throw new IllegalStateException("Unable to pre-load classes", cnfe);
}
}
@@ -129,7 +129,7 @@ public class BasicDataSource implements
*
* @param defaultAutoCommit default auto-commit value
*/
- public void setDefaultAutoCommit(Boolean defaultAutoCommit) {
+ public void setDefaultAutoCommit(final Boolean defaultAutoCommit) {
this.defaultAutoCommit = defaultAutoCommit;
}
@@ -159,7 +159,7 @@ public class BasicDataSource implements
*
* @param defaultReadOnly default read-only value
*/
- public void setDefaultReadOnly(Boolean defaultReadOnly) {
+ public void setDefaultReadOnly(final Boolean defaultReadOnly) {
this.defaultReadOnly = defaultReadOnly;
}
@@ -193,7 +193,7 @@ public class BasicDataSource implements
* state
* @see Connection#getTransactionIsolation
*/
- public void setDefaultTransactionIsolation(int defaultTransactionIsolation) {
+ public void setDefaultTransactionIsolation(final int defaultTransactionIsolation) {
this.defaultTransactionIsolation = defaultTransactionIsolation;
}
@@ -215,7 +215,7 @@ public class BasicDataSource implements
* created from this connection. <code>null</code> means that the driver
* default will be used.
*/
- public void setDefaultQueryTimeout(Integer defaultQueryTimeout) {
+ public void setDefaultQueryTimeout(final Integer defaultQueryTimeout) {
this.defaultQueryTimeout = defaultQueryTimeout;
}
@@ -245,7 +245,7 @@ public class BasicDataSource implements
*
* @param defaultCatalog the default catalog
*/
- public void setDefaultCatalog(String defaultCatalog) {
+ public void setDefaultCatalog(final String defaultCatalog) {
if (defaultCatalog != null && defaultCatalog.trim().length() > 0) {
this.defaultCatalog = defaultCatalog;
}
@@ -275,7 +275,7 @@ public class BasicDataSource implements
*
* @param cacheState The new value for the state caching flag
*/
- public void setCacheState(boolean cacheState) {
+ public void setCacheState(final boolean cacheState) {
this.cacheState = cacheState;
}
@@ -308,7 +308,7 @@ public class BasicDataSource implements
*
* @param driver
*/
- public synchronized void setDriver(Driver driver) {
+ public synchronized void setDriver(final Driver driver) {
this.driver = driver;
}
@@ -318,13 +318,13 @@ public class BasicDataSource implements
private String driverClassName = null;
/**
- * Returns the jdbc driver class name.
+ * Returns the JDBC driver class name.
* <p>
* Note: This getter only returns the last value set by a call to
* {@link #setDriverClassName(String)}. It does not return the class name of
* any driver that may have been set via {@link #setDriver(Driver)}.
*
- * @return the jdbc driver class name
+ * @return the JDBC driver class name
*/
@Override
public synchronized String getDriverClassName() {
@@ -332,16 +332,16 @@ public class BasicDataSource implements
}
/**
- * <p>Sets the jdbc driver class name.</p>
+ * <p>Sets the JDBC driver class name.</p>
* <p>
* Note: this method currently has no effect once the pool has been
* initialized. The pool is initialized the first time one of the
* following methods is invoked: <code>getConnection, setLogwriter,
* setLoginTimeout, getLoginTimeout, getLogWriter.</code></p>
*
- * @param driverClassName the class name of the jdbc driver
+ * @param driverClassName the class name of the JDBC driver
*/
- public synchronized void setDriverClassName(String driverClassName) {
+ public synchronized void setDriverClassName(final String driverClassName) {
if (driverClassName != null && driverClassName.trim().length() > 0) {
this.driverClassName = driverClassName;
}
@@ -383,7 +383,7 @@ public class BasicDataSource implements
* driver
*/
public synchronized void setDriverClassLoader(
- ClassLoader driverClassLoader) {
+ final ClassLoader driverClassLoader) {
this.driverClassLoader = driverClassLoader;
}
@@ -412,7 +412,7 @@ public class BasicDataSource implements
* @param lifo the new value for the LIFO property
*
*/
- public synchronized void setLifo(boolean lifo) {
+ public synchronized void setLifo(final boolean lifo) {
this.lifo = lifo;
if (connectionPool != null) {
connectionPool.setLifo(lifo);
@@ -445,7 +445,7 @@ public class BasicDataSource implements
* @param maxTotal the new value for maxTotal
* @see #getMaxTotal()
*/
- public synchronized void setMaxTotal(int maxTotal) {
+ public synchronized void setMaxTotal(final int maxTotal) {
this.maxTotal = maxTotal;
if (connectionPool != null) {
connectionPool.setMaxTotal(maxTotal);
@@ -484,7 +484,7 @@ public class BasicDataSource implements
* @see #getMaxIdle()
* @param maxIdle the new value for maxIdle
*/
- public synchronized void setMaxIdle(int maxIdle) {
+ public synchronized void setMaxIdle(final int maxIdle) {
this.maxIdle = maxIdle;
if (connectionPool != null) {
connectionPool.setMaxIdle(maxIdle);
@@ -523,7 +523,7 @@ public class BasicDataSource implements
* @param minIdle the new value for minIdle
* @see GenericObjectPool#setMinIdle(int)
*/
- public synchronized void setMinIdle(int minIdle) {
+ public synchronized void setMinIdle(final int minIdle) {
this.minIdle = minIdle;
if (connectionPool != null) {
connectionPool.setMinIdle(minIdle);
@@ -557,7 +557,7 @@ public class BasicDataSource implements
* @param initialSize the number of connections created when the pool
* is initialized
*/
- public synchronized void setInitialSize(int initialSize) {
+ public synchronized void setInitialSize(final int initialSize) {
this.initialSize = initialSize;
}
@@ -588,7 +588,7 @@ public class BasicDataSource implements
* @param maxWaitMillis the new value for MaxWaitMillis
* @see #getMaxWaitMillis()
*/
- public synchronized void setMaxWaitMillis(long maxWaitMillis) {
+ public synchronized void setMaxWaitMillis(final long maxWaitMillis) {
this.maxWaitMillis = maxWaitMillis;
if (connectionPool != null) {
connectionPool.setMaxWaitMillis(maxWaitMillis);
@@ -621,7 +621,7 @@ public class BasicDataSource implements
*
* @param poolingStatements pooling on or off
*/
- public synchronized void setPoolPreparedStatements(boolean poolingStatements) {
+ public synchronized void setPoolPreparedStatements(final boolean poolingStatements) {
this.poolPreparedStatements = poolingStatements;
}
@@ -660,7 +660,7 @@ public class BasicDataSource implements
*
* @param maxOpenStatements the new maximum number of prepared statements
*/
- public synchronized void setMaxOpenPreparedStatements(int maxOpenStatements) {
+ public synchronized void setMaxOpenPreparedStatements(final int maxOpenStatements) {
this.maxOpenPreparedStatements = maxOpenStatements;
}
@@ -691,7 +691,7 @@ public class BasicDataSource implements
*
* @param testOnCreate new value for testOnCreate property
*/
- public synchronized void setTestOnCreate(boolean testOnCreate) {
+ public synchronized void setTestOnCreate(final boolean testOnCreate) {
this.testOnCreate = testOnCreate;
if (connectionPool != null) {
connectionPool.setTestOnCreate(testOnCreate);
@@ -725,7 +725,7 @@ public class BasicDataSource implements
*
* @param testOnBorrow new value for testOnBorrow property
*/
- public synchronized void setTestOnBorrow(boolean testOnBorrow) {
+ public synchronized void setTestOnBorrow(final boolean testOnBorrow) {
this.testOnBorrow = testOnBorrow;
if (connectionPool != null) {
connectionPool.setTestOnBorrow(testOnBorrow);
@@ -756,7 +756,7 @@ public class BasicDataSource implements
*
* @param testOnReturn new value for testOnReturn property
*/
- public synchronized void setTestOnReturn(boolean testOnReturn) {
+ public synchronized void setTestOnReturn(final boolean testOnReturn) {
this.testOnReturn = testOnReturn;
if (connectionPool != null) {
connectionPool.setTestOnReturn(testOnReturn);
@@ -789,7 +789,7 @@ public class BasicDataSource implements
* @param timeBetweenEvictionRunsMillis the new time between evictor runs
* @see #timeBetweenEvictionRunsMillis
*/
- public synchronized void setTimeBetweenEvictionRunsMillis(long timeBetweenEvictionRunsMillis) {
+ public synchronized void setTimeBetweenEvictionRunsMillis(final long timeBetweenEvictionRunsMillis) {
this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
if (connectionPool != null) {
connectionPool.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
@@ -822,7 +822,7 @@ public class BasicDataSource implements
* value
* @see #numTestsPerEvictionRun
*/
- public synchronized void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {
+ public synchronized void setNumTestsPerEvictionRun(final int numTestsPerEvictionRun) {
this.numTestsPerEvictionRun = numTestsPerEvictionRun;
if (connectionPool != null) {
connectionPool.setNumTestsPerEvictionRun(numTestsPerEvictionRun);
@@ -854,7 +854,7 @@ public class BasicDataSource implements
* may sit idle in the pool
* @see #minEvictableIdleTimeMillis
*/
- public synchronized void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) {
+ public synchronized void setMinEvictableIdleTimeMillis(final long minEvictableIdleTimeMillis) {
this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
if (connectionPool != null) {
connectionPool.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
@@ -881,7 +881,7 @@ public class BasicDataSource implements
* assuming there are minIdle idle connections in the pool.
* @see #getSoftMinEvictableIdleTimeMillis
*/
- public synchronized void setSoftMinEvictableIdleTimeMillis(long softMinEvictableIdleTimeMillis) {
+ public synchronized void setSoftMinEvictableIdleTimeMillis(final long softMinEvictableIdleTimeMillis) {
this.softMinEvictableIdleTimeMillis = softMinEvictableIdleTimeMillis;
if (connectionPool != null) {
connectionPool.setSoftMinEvictableIdleTimeMillis(softMinEvictableIdleTimeMillis);
@@ -894,8 +894,8 @@ public class BasicDataSource implements
* the extra condition that at least "minIdle" connections remain in the
* pool.</p>
*
- * <p>When {@link #getMinEvictableIdleTimeMillis() miniEvictableIdleTimeMillis}
- * is set to a positive value, miniEvictableIdleTimeMillis is examined
+ * <p>When {@link #getMinEvictableIdleTimeMillis() minEvictableIdleTimeMillis}
+ * is set to a positive value, minEvictableIdleTimeMillis is examined
* first by the idle connection evictor - i.e. when idle connections are
* visited by the evictor, idle time is first compared against
* {@code minEvictableIdleTimeMillis} (without considering the number of idle
@@ -929,7 +929,7 @@ public class BasicDataSource implements
* EvictionPolicy implementation
*/
public synchronized void setEvictionPolicyClassName(
- String evictionPolicyClassName) {
+ final String evictionPolicyClassName) {
if (connectionPool != null) {
connectionPool.setEvictionPolicyClassName(evictionPolicyClassName);
}
@@ -961,7 +961,7 @@ public class BasicDataSource implements
*
* @param testWhileIdle new value for testWhileIdle property
*/
- public synchronized void setTestWhileIdle(boolean testWhileIdle) {
+ public synchronized void setTestWhileIdle(final boolean testWhileIdle) {
this.testWhileIdle = testWhileIdle;
if (connectionPool != null) {
connectionPool.setTestWhileIdle(testWhileIdle);
@@ -977,7 +977,7 @@ public class BasicDataSource implements
@Override
public int getNumActive() {
// Copy reference to avoid NPE if close happens after null check
- GenericObjectPool<PoolableConnection> pool = connectionPool;
+ final GenericObjectPool<PoolableConnection> pool = connectionPool;
if (pool != null) {
return pool.getNumActive();
}
@@ -994,7 +994,7 @@ public class BasicDataSource implements
@Override
public int getNumIdle() {
// Copy reference to avoid NPE if close happens after null check
- GenericObjectPool<PoolableConnection> pool = connectionPool;
+ final GenericObjectPool<PoolableConnection> pool = connectionPool;
if (pool != null) {
return pool.getNumIdle();
}
@@ -1027,7 +1027,7 @@ public class BasicDataSource implements
*
* @param password new value for the password
*/
- public void setPassword(String password) {
+ public void setPassword(final String password) {
this.password = password;
}
@@ -1058,7 +1058,7 @@ public class BasicDataSource implements
*
* @param url the new value for the JDBC connection url
*/
- public synchronized void setUrl(String url) {
+ public synchronized void setUrl(final String url) {
this.url = url;
}
@@ -1089,7 +1089,7 @@ public class BasicDataSource implements
*
* @param username the new value for the JDBC connection username
*/
- public void setUsername(String username) {
+ public void setUsername(final String username) {
this.username = username;
}
@@ -1124,7 +1124,7 @@ public class BasicDataSource implements
*
* @param validationQuery the new value for the validation query
*/
- public void setValidationQuery(String validationQuery) {
+ public void setValidationQuery(final String validationQuery) {
if (validationQuery != null && validationQuery.trim().length() > 0) {
this.validationQuery = validationQuery;
} else {
@@ -1160,7 +1160,7 @@ public class BasicDataSource implements
*
* @param timeout new validation query timeout value in seconds
*/
- public void setValidationQueryTimeout(int timeout) {
+ public void setValidationQueryTimeout(final int timeout) {
this.validationQueryTimeout = timeout;
}
@@ -1182,7 +1182,7 @@ public class BasicDataSource implements
* @return initialization SQL statements
*/
public List<String> getConnectionInitSqls() {
- List<String> result = connectionInitSqls;
+ final List<String> result = connectionInitSqls;
if (result == null) {
return Collections.emptyList();
}
@@ -1195,7 +1195,7 @@ public class BasicDataSource implements
*/
@Override
public String[] getConnectionInitSqlsAsArray() {
- Collection<String> result = getConnectionInitSqls();
+ final Collection<String> result = getConnectionInitSqls();
return result.toArray(new String[result.size()]);
}
@@ -1211,10 +1211,10 @@ public class BasicDataSource implements
* @param connectionInitSqls Collection of SQL statements to execute
* on connection creation
*/
- public void setConnectionInitSqls(Collection<String> connectionInitSqls) {
+ public void setConnectionInitSqls(final Collection<String> connectionInitSqls) {
if (connectionInitSqls != null && connectionInitSqls.size() > 0) {
ArrayList<String> newVal = null;
- for (String s : connectionInitSqls) {
+ for (final String s : connectionInitSqls) {
if (s != null && s.trim().length() > 0) {
if (newVal == null) {
newVal = new ArrayList<>();
@@ -1257,7 +1257,7 @@ public class BasicDataSource implements
*
* @param allow Access to the underlying connection is granted when true.
*/
- public synchronized void setAccessToUnderlyingConnectionAllowed(boolean allow) {
+ public synchronized void setAccessToUnderlyingConnectionAllowed(final boolean allow) {
this.accessToUnderlyingConnectionAllowed = allow;
}
@@ -1296,7 +1296,7 @@ public class BasicDataSource implements
* following methods is invoked: <code>getConnection, setLogwriter,
* setLoginTimeout, getLoginTimeout, getLogWriter.</code></p>
*/
- public void setMaxConnLifetimeMillis(long maxConnLifetimeMillis) {
+ public void setMaxConnLifetimeMillis(final long maxConnLifetimeMillis) {
this.maxConnLifetimeMillis = maxConnLifetimeMillis;
}
@@ -1306,7 +1306,7 @@ public class BasicDataSource implements
* pool closes connections due to maximum lifetime exceeded. Set this property
* to false to suppress log messages when connections expire.
*/
- public void setLogExpiredConnections(boolean logExpiredConnections) {
+ public void setLogExpiredConnections(final boolean logExpiredConnections) {
this.logExpiredConnections = logExpiredConnections;
}
@@ -1327,7 +1327,7 @@ public class BasicDataSource implements
* component registers this DataSource with JMX and this name is valid this
* name will be used in preference to any specified by the other component.
*/
- public void setJmxName(String jmxName) {
+ public void setJmxName(final String jmxName) {
this.jmxName = jmxName;
}
@@ -1352,7 +1352,7 @@ public class BasicDataSource implements
* if the auto commit setting is {@code false} when the connection
* is returned. It is <code>true</code> by default.
*/
- public void setEnableAutoCommitOnReturn(boolean enableAutoCommitOnReturn) {
+ public void setEnableAutoCommitOnReturn(final boolean enableAutoCommitOnReturn) {
this.enableAutoCommitOnReturn = enableAutoCommitOnReturn;
}
@@ -1372,7 +1372,7 @@ public class BasicDataSource implements
* is returned to the pool if auto commit is not enabled and the connection
* is not read only.
*/
- public void setRollbackOnReturn(boolean rollbackOnReturn) {
+ public void setRollbackOnReturn(final boolean rollbackOnReturn) {
this.rollbackOnReturn = rollbackOnReturn;
}
@@ -1385,7 +1385,7 @@ public class BasicDataSource implements
* @since 2.1
*/
public Set<String> getDisconnectionSqlCodes() {
- Set<String> result = disconnectionSqlCodes;
+ final Set<String> result = disconnectionSqlCodes;
if (result == null) {
return Collections.emptySet();
}
@@ -1399,7 +1399,7 @@ public class BasicDataSource implements
*/
@Override
public String[] getDisconnectionSqlCodesAsArray() {
- Collection<String> result = getDisconnectionSqlCodes();
+ final Collection<String> result = getDisconnectionSqlCodes();
return result.toArray(new String[result.size()]);
}
@@ -1425,10 +1425,10 @@ public class BasicDataSource implements
* @param disconnectionSqlCodes SQL_STATE codes considered to signal fatal conditions
* @since 2.1
*/
- public void setDisconnectionSqlCodes(Collection<String> disconnectionSqlCodes) {
+ public void setDisconnectionSqlCodes(final Collection<String> disconnectionSqlCodes) {
if (disconnectionSqlCodes != null && disconnectionSqlCodes.size() > 0) {
HashSet<String> newVal = null;
- for (String s : disconnectionSqlCodes) {
+ for (final String s : disconnectionSqlCodes) {
if (s != null && s.trim().length() > 0) {
if (newVal == null) {
newVal = new HashSet<>();
@@ -1464,7 +1464,7 @@ public class BasicDataSource implements
* fast fail validation
* @since 2.1
*/
- public void setFastFailValidation(boolean fastFailValidation) {
+ public void setFastFailValidation(final boolean fastFailValidation) {
this.fastFailValidation = fastFailValidation;
}
@@ -1518,11 +1518,11 @@ public class BasicDataSource implements
@Override
public Connection getConnection() throws SQLException {
if (Utils.IS_SECURITY_ENABLED) {
- PrivilegedExceptionAction<Connection> action = new PaGetConnection();
+ final PrivilegedExceptionAction<Connection> action = new PaGetConnection();
try {
return AccessController.doPrivileged(action);
- } catch (PrivilegedActionException e) {
- Throwable cause = e.getCause();
+ } catch (final PrivilegedActionException e) {
+ final Throwable cause = e.getCause();
if (cause instanceof SQLException) {
throw (SQLException) cause;
}
@@ -1545,7 +1545,7 @@ public class BasicDataSource implements
* @return nothing - always throws UnsupportedOperationException
*/
@Override
- public Connection getConnection(String user, String pass) throws SQLException {
+ public Connection getConnection(final String user, final String pass) throws SQLException {
// This method isn't supported by the PoolingDataSource returned by
// the createDataSource
throw new UnsupportedOperationException("Not supported by BasicDataSource");
@@ -1603,7 +1603,7 @@ public class BasicDataSource implements
* @throws SQLException if a database access error occurs
*/
@Override
- public void setLoginTimeout(int loginTimeout) throws SQLException {
+ public void setLoginTimeout(final int loginTimeout) throws SQLException {
// This method isn't supported by the PoolingDataSource returned by
// the createDataSource
throw new UnsupportedOperationException("Not supported by BasicDataSource");
@@ -1620,7 +1620,7 @@ public class BasicDataSource implements
* @throws SQLException if a database access error occurs
*/
@Override
- public void setLogWriter(PrintWriter logWriter) throws SQLException {
+ public void setLogWriter(final PrintWriter logWriter) throws SQLException {
createDataSource().setLogWriter(logWriter);
this.logWriter = logWriter;
}
@@ -1660,7 +1660,7 @@ public class BasicDataSource implements
* @see #getRemoveAbandonedOnMaintenance()
*/
public void setRemoveAbandonedOnMaintenance(
- boolean removeAbandonedOnMaintenance) {
+ final boolean removeAbandonedOnMaintenance) {
if (abandonedConfig == null) {
abandonedConfig = new AbandonedConfig();
}
@@ -1693,7 +1693,7 @@ public class BasicDataSource implements
* removed when connections are borrowed from the pool.
* @see #getRemoveAbandonedOnBorrow()
*/
- public void setRemoveAbandonedOnBorrow(boolean removeAbandonedOnBorrow) {
+ public void setRemoveAbandonedOnBorrow(final boolean removeAbandonedOnBorrow) {
if (abandonedConfig == null) {
abandonedConfig = new AbandonedConfig();
}
@@ -1738,7 +1738,7 @@ public class BasicDataSource implements
* @see #getRemoveAbandonedOnBorrow()
* @see #getRemoveAbandonedOnMaintenance()
*/
- public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) {
+ public void setRemoveAbandonedTimeout(final int removeAbandonedTimeout) {
if (abandonedConfig == null) {
abandonedConfig = new AbandonedConfig();
}
@@ -1766,7 +1766,7 @@ public class BasicDataSource implements
/**
* @param logAbandoned new logAbandoned property value
*/
- public void setLogAbandoned(boolean logAbandoned) {
+ public void setLogAbandoned(final boolean logAbandoned) {
if (abandonedConfig == null) {
abandonedConfig = new AbandonedConfig();
}
@@ -1790,7 +1790,7 @@ public class BasicDataSource implements
*
* @param logWriter The new log writer
*/
- public void setAbandonedLogWriter(PrintWriter logWriter) {
+ public void setAbandonedLogWriter(final PrintWriter logWriter) {
if (abandonedConfig == null) {
abandonedConfig = new AbandonedConfig();
}
@@ -1823,7 +1823,7 @@ public class BasicDataSource implements
* the recording of a stack trace on every use
* of a pooled connection
*/
- public void setAbandonedUsageTracking(boolean usageTracking) {
+ public void setAbandonedUsageTracking(final boolean usageTracking) {
if (abandonedConfig == null) {
abandonedConfig = new AbandonedConfig();
}
@@ -1842,7 +1842,7 @@ public class BasicDataSource implements
* @param name Name of the custom connection property
* @param value Value of the custom connection property
*/
- public void addConnectionProperty(String name, String value) {
+ public void addConnectionProperty(final String name, final String value) {
connectionProperties.put(name, value);
}
@@ -1852,7 +1852,7 @@ public class BasicDataSource implements
* @param name Name of the custom connection property to remove
* @see #addConnectionProperty(String, String)
*/
- public void removeConnectionProperty(String name) {
+ public void removeConnectionProperty(final String name) {
connectionProperties.remove(name);
}
@@ -1867,19 +1867,19 @@ public class BasicDataSource implements
* @param connectionProperties the connection properties used to
* create new connections
*/
- public void setConnectionProperties(String connectionProperties) {
+ public void setConnectionProperties(final String connectionProperties) {
if (connectionProperties == null) {
throw new NullPointerException("connectionProperties is null");
}
- String[] entries = connectionProperties.split(";");
- Properties properties = new Properties();
- for (String entry : entries) {
+ final String[] entries = connectionProperties.split(";");
+ final Properties properties = new Properties();
+ for (final String entry : entries) {
if (entry.length() > 0) {
- int index = entry.indexOf('=');
+ final int index = entry.indexOf('=');
if (index > 0) {
- String name = entry.substring(0, index);
- String value = entry.substring(index + 1);
+ final String name = entry.substring(0, index);
+ final String value = entry.substring(index + 1);
properties.setProperty(name, value);
} else {
// no value is empty string which is how java.util.Properties works
@@ -1911,26 +1911,26 @@ public class BasicDataSource implements
@Override
public synchronized void close() throws SQLException {
if (registeredJmxName != null) {
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
try {
mbs.unregisterMBean(registeredJmxName);
- } catch (JMException e) {
+ } catch (final JMException e) {
log.warn("Failed to unregister the JMX name: " + registeredJmxName, e);
} finally {
registeredJmxName = null;
}
}
closed = true;
- GenericObjectPool<?> oldpool = connectionPool;
+ final GenericObjectPool<?> oldpool = connectionPool;
connectionPool = null;
dataSource = null;
try {
if (oldpool != null) {
oldpool.close();
}
- } catch(RuntimeException e) {
+ } catch(final RuntimeException e) {
throw e;
- } catch(Exception e) {
+ } catch(final Exception e) {
throw new SQLException(Utils.getMessage("pool.close.fail"), e);
}
}
@@ -1945,12 +1945,12 @@ public class BasicDataSource implements
}
@Override
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
+ public boolean isWrapperFor(final Class<?> iface) throws SQLException {
return false;
}
@Override
- public <T> T unwrap(Class<T> iface) throws SQLException {
+ public <T> T unwrap(final Class<T> iface) throws SQLException {
throw new SQLException("BasicDataSource is not a wrapper.");
}
@@ -1967,7 +1967,7 @@ public class BasicDataSource implements
* if invalidating the connection failed.
* @since 2.1
*/
- public void invalidateConnection(Connection connection) throws IllegalStateException {
+ public void invalidateConnection(final Connection connection) throws IllegalStateException {
if (connection == null) {
return;
}
@@ -1982,7 +1982,7 @@ public class BasicDataSource implements
throw new IllegalStateException(
"Cannot invalidate connection: Connection is not a poolable connection.");
}
- } catch (SQLException e) {
+ } catch (final SQLException e) {
throw new IllegalStateException("Cannot invalidate connection: Unwrapping poolable connection failed.", e);
}
@@ -1995,7 +1995,7 @@ public class BasicDataSource implements
try {
connectionPool.invalidateObject(poolableConnection);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new IllegalStateException("Invalidating connection threw unexpected exception", e);
}
}
@@ -2029,7 +2029,7 @@ public class BasicDataSource implements
jmxRegister();
// create factory which returns raw physical connections
- ConnectionFactory driverConnectionFactory = createConnectionFactory();
+ final ConnectionFactory driverConnectionFactory = createConnectionFactory();
// Set up the poolable connection factory
boolean success = false;
@@ -2042,11 +2042,11 @@ public class BasicDataSource implements
poolableConnectionFactory.setMaxOpenPrepatedStatements(
maxOpenPreparedStatements);
success = true;
- } catch (SQLException se) {
+ } catch (final SQLException se) {
throw se;
- } catch (RuntimeException rte) {
+ } catch (final RuntimeException rte) {
throw rte;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new SQLException("Error creating connection factory", ex);
}
@@ -2062,11 +2062,11 @@ public class BasicDataSource implements
newDataSource = createDataSourceInstance();
newDataSource.setLogWriter(logWriter);
success = true;
- } catch (SQLException se) {
+ } catch (final SQLException se) {
throw se;
- } catch (RuntimeException rte) {
+ } catch (final RuntimeException rte) {
throw rte;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new SQLException("Error creating datasource", ex);
} finally {
if (!success) {
@@ -2079,7 +2079,7 @@ public class BasicDataSource implements
for (int i = 0 ; i < initialSize ; i++) {
connectionPool.addObject();
}
- } catch (Exception e) {
+ } catch (final Exception e) {
closeConnectionPool();
throw new SQLException("Error preloading the connection pool", e);
}
@@ -2125,13 +2125,13 @@ public class BasicDataSource implements
driverFromCCL = Class.forName(
driverClassName, true, driverClassLoader);
}
- } catch (ClassNotFoundException cnfe) {
+ } catch (final ClassNotFoundException cnfe) {
driverFromCCL = Thread.currentThread(
).getContextClassLoader().loadClass(
driverClassName);
}
- } catch (Exception t) {
- String message = "Cannot load JDBC driver class '" +
+ } catch (final Exception t) {
+ final String message = "Cannot load JDBC driver class '" +
driverClassName + "'";
logWriter.println(message);
t.printStackTrace(logWriter);
@@ -2151,8 +2151,8 @@ public class BasicDataSource implements
throw new SQLException("No suitable driver", "08001");
}
}
- } catch (Exception t) {
- String message = "Cannot create JDBC driver of class '" +
+ } catch (final Exception t) {
+ final String message = "Cannot create JDBC driver of class '" +
(driverClassName != null ? driverClassName : "") +
"' for connect URL '" + url + "'";
logWriter.println(message);
@@ -2162,21 +2162,21 @@ public class BasicDataSource implements
}
// Set up the driver connection factory we will use
- String user = username;
+ final String user = username;
if (user != null) {
connectionProperties.put("user", user);
} else {
log("DBCP DataSource configured without a 'username'");
}
- String pwd = password;
+ final String pwd = password;
if (pwd != null) {
connectionProperties.put("password", pwd);
} else {
log("DBCP DataSource configured without a 'password'");
}
- ConnectionFactory driverConnectionFactory =
+ final ConnectionFactory driverConnectionFactory =
new DriverConnectionFactory(driverToUse, url, connectionProperties);
return driverConnectionFactory;
}
@@ -2191,9 +2191,9 @@ public class BasicDataSource implements
* to a positive value causes {@link GenericObjectPool}'s eviction timer
* to be started.
*/
- protected void createConnectionPool(PoolableConnectionFactory factory) {
+ protected void createConnectionPool(final PoolableConnectionFactory factory) {
// Create an object pool to contain our active connections
- GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+ 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;
@@ -2214,6 +2214,7 @@ public class BasicDataSource implements
gop.setTestOnReturn(testOnReturn);
gop.setNumTestsPerEvictionRun(numTestsPerEvictionRun);
gop.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+ gop.setSoftMinEvictableIdleTimeMillis(softMinEvictableIdleTimeMillis);
gop.setTestWhileIdle(testWhileIdle);
gop.setLifo(lifo);
gop.setSwallowedExceptionListener(new SwallowedExceptionLogger(log, logExpiredConnections));
@@ -2226,13 +2227,13 @@ public class BasicDataSource implements
* Closes the connection pool, silently swallowing any exception that occurs.
*/
private void closeConnectionPool() {
- GenericObjectPool<?> oldpool = connectionPool;
+ final GenericObjectPool<?> oldpool = connectionPool;
connectionPool = null;
try {
if (oldpool != null) {
oldpool.close();
}
- } catch(Exception e) {
+ } catch(final Exception e) {
/* Ignore */
}
}
@@ -2253,7 +2254,7 @@ public class BasicDataSource implements
* @throws SQLException if unable to create a datasource instance
*/
protected DataSource createDataSourceInstance() throws SQLException {
- PoolingDataSource<PoolableConnection> pds = new PoolingDataSource<>(connectionPool);
+ final PoolingDataSource<PoolableConnection> pds = new PoolingDataSource<>(connectionPool);
pds.setAccessToUnderlyingConnectionAllowed(isAccessToUnderlyingConnectionAllowed());
return pds;
}
@@ -2266,7 +2267,7 @@ public class BasicDataSource implements
* @throws SQLException if an error occurs creating the PoolableConnectionFactory
*/
protected PoolableConnectionFactory createPoolableConnectionFactory(
- ConnectionFactory driverConnectionFactory) throws SQLException {
+ final ConnectionFactory driverConnectionFactory) throws SQLException {
PoolableConnectionFactory connectionFactory = null;
try {
connectionFactory = new PoolableConnectionFactory(driverConnectionFactory, registeredJmxName);
@@ -2287,16 +2288,16 @@ public class BasicDataSource implements
connectionFactory.setFastFailValidation(fastFailValidation);
connectionFactory.setDisconnectionSqlCodes(disconnectionSqlCodes);
validateConnectionFactory(connectionFactory);
- } catch (RuntimeException e) {
+ } catch (final RuntimeException e) {
throw e;
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new SQLException("Cannot create PoolableConnectionFactory (" + e.getMessage() + ")", e);
}
return connectionFactory;
}
protected static void validateConnectionFactory(
- PoolableConnectionFactory connectionFactory) throws Exception {
+ final PoolableConnectionFactory connectionFactory) throws Exception {
PoolableConnection conn = null;
PooledObject<PoolableConnection> p = null;
try {
@@ -2313,7 +2314,7 @@ public class BasicDataSource implements
}
}
- protected void log(String message) {
+ protected void log(final String message) {
if (logWriter != null) {
logWriter.println(message);
}
@@ -2330,20 +2331,20 @@ public class BasicDataSource implements
return;
}
// Return immediately if no JMX name has been specified
- String requestedName = getJmxName();
+ final String requestedName = getJmxName();
if (requestedName == null) {
return;
}
ObjectName oname;
try {
oname = new ObjectName(requestedName);
- } catch (MalformedObjectNameException e) {
+ } catch (final MalformedObjectNameException e) {
log.warn("The requested JMX name [" + requestedName +
"] was not valid and will be ignored.");
return;
}
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
try {
mbs.registerMBean(this, oname);
} catch (InstanceAlreadyExistsException | MBeanRegistrationException
@@ -2353,12 +2354,12 @@ public class BasicDataSource implements
}
@Override
- public ObjectName preRegister(MBeanServer server, ObjectName name) {
- String requestedName = getJmxName();
+ public ObjectName preRegister(final MBeanServer server, final ObjectName name) {
+ final String requestedName = getJmxName();
if (requestedName != null) {
try {
registeredJmxName = new ObjectName(requestedName);
- } catch (MalformedObjectNameException e) {
+ } catch (final MalformedObjectNameException e) {
log.warn("The requested JMX name [" + requestedName +
"] was not valid and will be ignored.");
}
@@ -2370,7 +2371,7 @@ public class BasicDataSource implements
}
@Override
- public void postRegister(Boolean registrationDone) {
+ public void postRegister(final Boolean registrationDone) {
// NO-OP
}
@@ -2384,11 +2385,11 @@ public class BasicDataSource implements
// NO-OP
}
- private void updateJmxName(GenericObjectPoolConfig config) {
+ private void updateJmxName(final GenericObjectPoolConfig config) {
if (registeredJmxName == null) {
return;
}
- StringBuilder base = new StringBuilder(registeredJmxName.toString());
+ final StringBuilder base = new StringBuilder(registeredJmxName.toString());
base.append(Constants.JMX_CONNECTION_POOL_BASE_EXT);
config.setJmxNameBase(base.toString());
config.setJmxNamePrefix(Constants.JMX_CONNECTION_POOL_PREFIX);
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java?rev=1743727&r1=1743726&r2=1743727&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSourceFactory.java Fri May 13 19:03:42 2016
@@ -238,7 +238,7 @@ public class BasicDataSourceFactory impl
* @exception Exception if an exception occurs creating the instance
*/
@Override
- public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable<?,?> environment)
+ public Object getObjectInstance(final Object obj, final Name name, final Context nameCtx, final Hashtable<?,?> environment)
throws Exception {
// We only know how to deal with <code>javax.naming.Reference</code>s
@@ -246,7 +246,7 @@ public class BasicDataSourceFactory impl
if (obj == null || !(obj instanceof Reference)) {
return null;
}
- Reference ref = (Reference) obj;
+ final Reference ref = (Reference) obj;
if (!"javax.sql.DataSource".equals(ref.getClassName())) {
return null;
}
@@ -255,18 +255,18 @@ public class BasicDataSourceFactory impl
final List<String> warnings = new ArrayList<>();
final List<String> infoMessages = new ArrayList<>();
validatePropertyNames(ref, name, warnings, infoMessages);
- for (String warning : warnings) {
+ for (final String warning : warnings) {
log.warn(warning);
}
- for (String infoMessage : infoMessages) {
+ for (final String infoMessage : infoMessages) {
log.info(infoMessage);
}
- Properties properties = new Properties();
- for (String propertyName : ALL_PROPERTIES) {
- RefAddr ra = ref.get(propertyName);
+ final Properties properties = new Properties();
+ for (final String propertyName : ALL_PROPERTIES) {
+ final RefAddr ra = ref.get(propertyName);
if (ra != null) {
- String propertyValue = ra.getContent().toString();
+ final String propertyValue = ra.getContent().toString();
properties.setProperty(propertyName, propertyValue);
}
}
@@ -283,12 +283,12 @@ public class BasicDataSourceFactory impl
* @param warnings container for warning messages
* @param infoMessages container for info messages
*/
- private void validatePropertyNames(Reference ref, Name name, List<String> warnings,
- List<String> infoMessages) {
+ private void validatePropertyNames(final Reference ref, final Name name, final List<String> warnings,
+ final List<String> infoMessages) {
final List<String> allPropsAsList = Arrays.asList(ALL_PROPERTIES);
final String nameString = name != null ? "Name = " + name.toString() + " " : "";
if (NUPROP_WARNTEXT!=null && !NUPROP_WARNTEXT.keySet().isEmpty()) {
- for (String propertyName : NUPROP_WARNTEXT.keySet()) {
+ for (final String propertyName : NUPROP_WARNTEXT.keySet()) {
final RefAddr ra = ref.get(propertyName);
if (ra != null && !allPropsAsList.contains(ra.getType())) {
final StringBuilder stringBuilder = new StringBuilder(nameString);
@@ -333,8 +333,8 @@ public class BasicDataSourceFactory impl
* @param properties the datasource configuration properties
* @throws Exception if an error occurs creating the data source
*/
- public static BasicDataSource createDataSource(Properties properties) throws Exception {
- BasicDataSource dataSource = new BasicDataSource();
+ public static BasicDataSource createDataSource(final Properties properties) throws Exception {
+ final BasicDataSource dataSource = new BasicDataSource();
String value = null;
value = properties.getProperty(PROP_DEFAULTAUTOCOMMIT);
@@ -368,7 +368,7 @@ public class BasicDataSourceFactory impl
else {
try {
level = Integer.parseInt(value);
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
System.err.println("Could not parse defaultTransactionIsolation: " + value);
System.err.println("WARNING: defaultTransactionIsolation not set");
System.err.println("using default value of database driver");
@@ -540,10 +540,10 @@ public class BasicDataSourceFactory impl
value = properties.getProperty(PROP_CONNECTIONPROPERTIES);
if (value != null) {
- Properties p = getProperties(value);
- Enumeration<?> e = p.propertyNames();
+ final Properties p = getProperties(value);
+ final Enumeration<?> e = p.propertyNames();
while (e.hasMoreElements()) {
- String propertyName = (String) e.nextElement();
+ final String propertyName = (String) e.nextElement();
dataSource.addConnectionProperty(propertyName, p.getProperty(propertyName));
}
}
@@ -604,8 +604,8 @@ public class BasicDataSourceFactory impl
* @return Properties
* @throws Exception
*/
- private static Properties getProperties(String propText) throws Exception {
- Properties p = new Properties();
+ private static Properties getProperties(final String propText) throws Exception {
+ final Properties p = new Properties();
if (propText != null) {
p.load(new ByteArrayInputStream(
propText.replace(';', '\n').getBytes(StandardCharsets.ISO_8859_1)));
@@ -619,9 +619,9 @@ public class BasicDataSourceFactory impl
* @param delimiter character used to separate values in the list
* @return String Collection of values
*/
- private static Collection<String> parseList(String value, char delimiter) {
- StringTokenizer tokenizer = new StringTokenizer(value, Character.toString(delimiter));
- Collection<String> tokens = new ArrayList<>(tokenizer.countTokens());
+ private static Collection<String> parseList(final String value, final char delimiter) {
+ final StringTokenizer tokenizer = new StringTokenizer(value, Character.toString(delimiter));
+ final Collection<String> tokens = new ArrayList<>(tokenizer.countTokens());
while (tokenizer.hasMoreTokens()) {
tokens.add(tokenizer.nextToken());
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DataSourceConnectionFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DataSourceConnectionFactory.java?rev=1743727&r1=1743726&r2=1743727&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DataSourceConnectionFactory.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/dbcp/dbcp2/DataSourceConnectionFactory.java Fri May 13 19:03:42 2016
@@ -28,11 +28,11 @@ import javax.sql.DataSource;
* @since 2.0
*/
public class DataSourceConnectionFactory implements ConnectionFactory {
- public DataSourceConnectionFactory(DataSource source) {
+ public DataSourceConnectionFactory(final DataSource source) {
this(source,null,null);
}
- public DataSourceConnectionFactory(DataSource source, String uname, String passwd) {
+ public DataSourceConnectionFactory(final DataSource source, final String uname, final String passwd) {
_source = source;
_uname = uname;
_passwd = passwd;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org