Author: markt
Date: Wed Dec 6 10:31:20 2017
New Revision: 1817279
URL: http://svn.apache.org/viewvc?rev=1817279&view=rev
Log:
Align the Commons Pool fork to the 2.4.3 release.
Added:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/CallStack.java
- copied, changed from r1817092,
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/CallStack.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/CallStackUtils.java
- copied unchanged from r1817096,
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/CallStackUtils.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/NoOpCallStack.java
- copied unchanged from r1817096,
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/NoOpCallStack.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SecurityManagerCallStack.java
- copied unchanged from r1817096,
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SecurityManagerCallStack.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java
- copied, changed from r1817092,
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/MERGE.txt
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObject.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 6 10:31:20 2017
@@ -1,2 +1,2 @@
/tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763748,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,176
8283,1768520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-
1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,17885
50,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790213,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793716,1793719,1793736,1793746,1793758,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,17
95289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446
,1803451,1803456,1803459,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808482,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811
704,1811837-1811839,1811861,1811932,1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157,1816338,1816418,1816431,1816443,1816538,1816541,1816545,1816549-1816550,1816563,1816570,1816647,1816695-1816704,1816716,1816780,1816887,1817089,1817223
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763748,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,176
8283,1768520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-
1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,17885
50,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790213,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793716,1793719,1793736,1793746,1793758,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,17
95289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446
,1803451,1803456,1803459,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808482,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811
704,1811837-1811839,1811861,1811932,1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157,1816338,1816418,1816431,1816443,1816538,1816541,1816545,1816549-1816550,1816563,1816570,1816647,1816695-1816704,1816716,1816780,1816887,1817089,1817092,1817096,1817104,1817223
Modified: tomcat/tc8.5.x/trunk/MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/MERGE.txt?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/MERGE.txt (original)
+++ tomcat/tc8.5.x/trunk/MERGE.txt Wed Dec 6 10:31:20 2017
@@ -35,13 +35,15 @@ BCEL
org.apache.tomcat.util.bcel is copied from:
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel
-DBCP
+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
-org.apache.tomcat.dbcp.pool2 is copied from:
-/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2
+
+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
@@ -70,3 +72,9 @@ 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.
+
+Pool2
+Sub-tree
+src/main/java/org/apache/commons/pool2
+The SHA1 ID for the most recent commit to be merged to Tomcat is:
+191a391166a8565718ef685531afa3fa44afd69c
Propchange: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 6 10:31:20 2017
@@ -1,2 +1,2 @@
/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1757166
-/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2:1743698,1757168,1811203,1811220
+/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2:1743698,1757168,1811203,1811220,1817092,1817096,1817104
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
Wed Dec 6 10:31:20 2017
@@ -66,11 +66,12 @@ public abstract class BaseKeyedPooledObj
* The default implementation is a no-op.
*
* @param key the key used when selecting the instance
- * @param p a {@code PooledObject} wrapping the the instance to be
destroyed
+ * @param p a {@code PooledObject} wrapping the instance to be destroyed
*/
@Override
public void destroyObject(final K key, final PooledObject<V> p)
throws Exception {
+ // The default implementation is a no-op.
}
/**
@@ -79,7 +80,7 @@ public abstract class BaseKeyedPooledObj
* The default implementation always returns {@code true}.
*
* @param key the key used when selecting the object
- * @param p a {@code PooledObject} wrapping the the instance to be
validated
+ * @param p a {@code PooledObject} wrapping the instance to be validated
* @return always <code>true</code> in the default implementation
*/
@Override
@@ -93,11 +94,12 @@ public abstract class BaseKeyedPooledObj
* The default implementation is a no-op.
*
* @param key the key used when selecting the object
- * @param p a {@code PooledObject} wrapping the the instance to be
activated
+ * @param p a {@code PooledObject} wrapping the instance to be activated
*/
@Override
public void activateObject(final K key, final PooledObject<V> p)
throws Exception {
+ // The default implementation is a no-op.
}
/**
@@ -106,10 +108,11 @@ public abstract class BaseKeyedPooledObj
* The default implementation is a no-op.
*
* @param key the key used when selecting the object
- * @param p a {@code PooledObject} wrapping the the instance to be
passivated
+ * @param p a {@code PooledObject} wrapping the instance to be passivated
*/
@Override
public void passivateObject(final K key, final PooledObject<V> p)
throws Exception {
+ // The default implementation is a no-op.
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.java
Wed Dec 6 10:31:20 2017
@@ -66,6 +66,7 @@ public abstract class BasePooledObjectFa
@Override
public void destroyObject(final PooledObject<T> p)
throws Exception {
+ // The default implementation is a no-op.
}
/**
@@ -87,6 +88,7 @@ public abstract class BasePooledObjectFa
*/
@Override
public void activateObject(final PooledObject<T> p) throws Exception {
+ // The default implementation is a no-op.
}
/**
@@ -97,5 +99,6 @@ public abstract class BasePooledObjectFa
@Override
public void passivateObject(final PooledObject<T> p)
throws Exception {
+ // The default implementation is a no-op.
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
Wed Dec 6 10:31:20 2017
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.dbcp.pool2;
+import java.io.Closeable;
import java.util.NoSuchElementException;
/**
@@ -60,7 +61,7 @@ import java.util.NoSuchElementException;
*
* @since 2.0
*/
-public interface KeyedObjectPool<K,V> {
+public interface KeyedObjectPool<K,V> extends Closeable {
/**
* Obtains an instance from this pool for the specified <code>key</code>.
* <p>
@@ -224,5 +225,6 @@ public interface KeyedObjectPool<K,V> {
* <p>
* Implementations should silently fail if not all resources can be freed.
*/
+ @Override
void close();
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/ObjectPool.java Wed
Dec 6 10:31:20 2017
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.dbcp.pool2;
+import java.io.Closeable;
import java.util.NoSuchElementException;
/**
@@ -54,7 +55,7 @@ import java.util.NoSuchElementException;
*
* @since 2.0
*/
-public interface ObjectPool<T> {
+public interface ObjectPool<T> extends Closeable {
/**
* Obtains an instance from this pool.
* <p>
@@ -172,5 +173,6 @@ public interface ObjectPool<T> {
* <p>
* Implementations should silently fail if not all resources can be freed.
*/
+ @Override
void close();
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/PoolUtils.java Wed
Dec 6 10:31:20 2017
@@ -562,6 +562,8 @@ public final class PoolUtils {
* Timer task that adds objects to the pool until the number of idle
* instances reaches the configured minIdle. Note that this is not the same
* as the pool's minIdle setting.
+ *
+ * @param <T> type of objects in the pool
*/
private static final class ObjectPoolMinIdleTimerTask<T> extends TimerTask
{
@@ -631,6 +633,9 @@ public final class PoolUtils {
* Timer task that adds objects to the pool until the number of idle
* instances for the given key reaches the configured minIdle. Note that
* this is not the same as the pool's minIdle setting.
+ *
+ * @param <K> object pool key type
+ * @param <V> object pool value type
*/
private static final class KeyedObjectPoolMinIdleTimerTask<K, V> extends
TimerTask {
@@ -715,6 +720,8 @@ public final class PoolUtils {
* another layer of synchronization will cause liveliness issues or a
* deadlock.
* </p>
+ *
+ * @param <T> type of objects in the pool
*/
private static final class SynchronizedObjectPool<T> implements
ObjectPool<T> {
@@ -888,6 +895,9 @@ public final class PoolUtils {
* another layer of synchronization will cause liveliness issues or a
* deadlock.
* </p>
+ *
+ * @param <K> object pool key type
+ * @param <V> object pool value type
*/
private static final class SynchronizedKeyedObjectPool<K, V> implements
KeyedObjectPool<K, V> {
@@ -1103,6 +1113,8 @@ public final class PoolUtils {
* provide proper synchronization such as the pools provided in the Commons
* Pool library.
* </p>
+ *
+ * @param <T> pooled object factory type
*/
private static final class SynchronizedPooledObjectFactory<T> implements
PooledObjectFactory<T> {
@@ -1216,6 +1228,9 @@ public final class PoolUtils {
* provide proper synchronization such as the pools provided in the Commons
* Pool library.
* </p>
+ *
+ * @param <K> pooled object factory key type
+ * @param <V> pooled object factory key value
*/
private static final class SynchronizedKeyedPooledObjectFactory<K, V>
implements KeyedPooledObjectFactory<K, V> {
@@ -1399,6 +1414,8 @@ public final class PoolUtils {
* Decorates an object pool, adding "eroding" behavior. Based on the
* configured {@link #factor erosion factor}, objects returning to the pool
* may be invalidated instead of being added to idle capacity.
+ *
+ * @param <T> type of objects in the pool
*/
private static class ErodingObjectPool<T> implements ObjectPool<T> {
/** Underlying object pool */
@@ -1540,6 +1557,9 @@ public final class PoolUtils {
* Decorates a keyed object pool, adding "eroding" behavior. Based on the
* configured erosion factor, objects returning to the pool
* may be invalidated instead of being added to idle capacity.
+ *
+ * @param <K> object pool key type
+ * @param <V> object pool value type
*/
private static class ErodingKeyedObjectPool<K, V> implements
KeyedObjectPool<K, V> {
@@ -1750,6 +1770,9 @@ public final class PoolUtils {
* Extends ErodingKeyedObjectPool to allow erosion to take place on a
* per-key basis. Timing of erosion events is tracked separately for
* separate keyed pools.
+ *
+ * @param <K> object pool key type
+ * @param <V> object pool value type
*/
private static final class ErodingPerKeyKeyedObjectPool<K, V> extends
ErodingKeyedObjectPool<K, V> {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObject.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObject.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObject.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/PooledObject.java
Wed Dec 6 10:31:20 2017
@@ -48,7 +48,7 @@ public interface PooledObject<T> extends
long getCreateTime();
/**
- * Obtain the time in milliseconds that this object last spent in the the
+ * Obtain the time in milliseconds that this object last spent in the
* active state (it may still be active in which case subsequent calls will
* return an increased value).
*
@@ -57,7 +57,7 @@ public interface PooledObject<T> extends
long getActiveTimeMillis();
/**
- * Obtain the time in milliseconds that this object last spend in the the
+ * Obtain the time in milliseconds that this object last spend in the
* idle state (it may still be idle in which case subsequent calls will
* return an increased value).
*
@@ -167,6 +167,18 @@ public interface PooledObject<T> extends
*/
void setLogAbandoned(boolean logAbandoned);
+// TODO: uncomment in 3.0 (API compatibility)
+// /**
+// * Configures the stack trace generation strategy based on whether or
not fully
+// * detailed stack traces are required. When set to false, abandoned logs
may
+// * only include caller class information rather than method names, line
numbers,
+// * and other normal metadata available in a full stack trace.
+// *
+// * @param requireFullStackTrace the new configuration setting for
abandoned object
+// * logging
+// */
+// void setRequireFullStackTrace(boolean requireFullStackTrace);
+
/**
* Record the current stack trace as the last time the object was used.
*/
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/AbandonedConfig.java
Wed Dec 6 10:31:20 2017
@@ -168,6 +168,43 @@ public class AbandonedConfig {
}
/**
+ * Determines whether or not to log full stack traces when logAbandoned is
true.
+ * If disabled, then a faster method for logging stack traces with only
class data
+ * may be used if possible.
+ *
+ * @since 2.5
+ */
+ private boolean requireFullStackTrace = true;
+
+ /**
+ * Indicates if full stack traces are required when {@link
#getLogAbandoned() logAbandoned}
+ * is true. Defaults to true. Logging of abandoned objects requiring a
full stack trace will
+ * generate an entire stack trace to generate for every object created. If
this is disabled,
+ * a faster but less informative stack walking mechanism may be used if
available.
+ *
+ * @return true if full stack traces are required for logging abandoned
connections, or false
+ * if abbreviated stack traces are acceptable
+ * @see CallStack
+ * @since 2.5
+ */
+ public boolean getRequireFullStackTrace() {
+ return requireFullStackTrace;
+ }
+
+ /**
+ * Sets the flag to require full stack traces for logging abandoned
connections when enabled.
+ *
+ * @param requireFullStackTrace indicates whether or not full stack traces
are required in
+ * abandoned connection logs
+ * @see CallStack
+ * @see #getRequireFullStackTrace()
+ * @since 2.5
+ */
+ public void setRequireFullStackTrace(boolean requireFullStackTrace) {
+ this.requireFullStackTrace = requireFullStackTrace;
+ }
+
+ /**
* PrintWriter to use to log information on abandoned objects.
* Use of default system encoding is deliberate.
*/
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
Wed Dec 6 10:31:20 2017
@@ -25,6 +25,7 @@ import java.util.Arrays;
import java.util.Deque;
import java.util.Iterator;
import java.util.TimerTask;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import javax.management.InstanceAlreadyExistsException;
@@ -85,6 +86,8 @@ public abstract class BaseGenericObjectP
private volatile long softMinEvictableIdleTimeMillis =
BaseObjectPoolConfig.DEFAULT_SOFT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
private volatile EvictionPolicy<T> evictionPolicy;
+ private volatile long evictorShutdownTimeoutMillis =
+ BaseObjectPoolConfig.DEFAULT_EVICTOR_SHUTDOWN_TIMEOUT_MILLIS;
// Internal (primarily state) attributes
@@ -611,6 +614,9 @@ public abstract class BaseGenericObjectP
final
EvictionPolicy<T> evicPolicy = (EvictionPolicy<T>) policy;
this.evictionPolicy = evicPolicy;
+ } else {
+ throw new IllegalArgumentException("[" +
evictionPolicyClassName +
+ "] does not implement EvictionPolicy");
}
} catch (final ClassNotFoundException e) {
throw new IllegalArgumentException(
@@ -623,6 +629,31 @@ public abstract class BaseGenericObjectP
}
}
+ /**
+ * Gets the timeout that will be used when waiting for the Evictor to
+ * shutdown if this pool is closed and it is the only pool still using the
+ * the value for the Evictor.
+ *
+ * @return The timeout in milliseconds that will be used while waiting for
+ * the Evictor to shut down.
+ */
+ public final long getEvictorShutdownTimeoutMillis() {
+ return evictorShutdownTimeoutMillis;
+ }
+
+ /**
+ * Sets the timeout that will be used when waiting for the Evictor to
+ * shutdown if this pool is closed and it is the only pool still using the
+ * the value for the Evictor.
+ *
+ * @param evictorShutdownTimeoutMillis the timeout in milliseconds that
+ * will be used while waiting for the
+ * Evictor to shut down.
+ */
+ public final void setEvictorShutdownTimeoutMillis(
+ final long evictorShutdownTimeoutMillis) {
+ this.evictorShutdownTimeoutMillis = evictorShutdownTimeoutMillis;
+ }
/**
* Closes the pool, destroys the remaining idle objects and, if registered
@@ -683,7 +714,7 @@ public abstract class BaseGenericObjectP
final void startEvictor(final long delay) {
synchronized (evictionLock) {
if (null != evictor) {
- EvictionTimer.cancel(evictor);
+ EvictionTimer.cancel(evictor, evictorShutdownTimeoutMillis,
TimeUnit.MILLISECONDS);
evictor = null;
evictionIterator = null;
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java
Wed Dec 6 10:31:20 2017
@@ -68,6 +68,15 @@ public abstract class BaseObjectPoolConf
public static final long DEFAULT_SOFT_MIN_EVICTABLE_IDLE_TIME_MILLIS = -1;
/**
+ * The default value for {@code evictorShutdownTimeoutMillis} configuration
+ * attribute.
+ * @see GenericObjectPool#getEvictorShutdownTimeoutMillis()
+ * @see GenericKeyedObjectPool#getEvictorShutdownTimeoutMillis()
+ */
+ public static final long DEFAULT_EVICTOR_SHUTDOWN_TIMEOUT_MILLIS =
+ 10L * 1000L;
+
+ /**
* The default value for the {@code numTestsPerEvictionRun} configuration
* attribute.
* @see GenericObjectPool#getNumTestsPerEvictionRun()
@@ -161,13 +170,16 @@ public abstract class BaseObjectPoolConf
private long maxWaitMillis = DEFAULT_MAX_WAIT_MILLIS;
private long minEvictableIdleTimeMillis =
- DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
+ DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
+
+ private long evictorShutdownTimeoutMillis =
+ DEFAULT_EVICTOR_SHUTDOWN_TIMEOUT_MILLIS;
private long softMinEvictableIdleTimeMillis =
- DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
+ DEFAULT_SOFT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
private int numTestsPerEvictionRun =
- DEFAULT_NUM_TESTS_PER_EVICTION_RUN;
+ DEFAULT_NUM_TESTS_PER_EVICTION_RUN;
private String evictionPolicyClassName =
DEFAULT_EVICTION_POLICY_CLASS_NAME;
@@ -180,7 +192,7 @@ public abstract class BaseObjectPoolConf
private boolean testWhileIdle = DEFAULT_TEST_WHILE_IDLE;
private long timeBetweenEvictionRunsMillis =
- DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
+ DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
private boolean blockWhenExhausted = DEFAULT_BLOCK_WHEN_EXHAUSTED;
@@ -365,6 +377,36 @@ public abstract class BaseObjectPoolConf
}
/**
+ * Get the value for the {@code evictorShutdownTimeoutMillis} configuration
+ * attribute for pools created with this configuration instance.
+ *
+ * @return The current setting of {@code evictorShutdownTimeoutMillis} for
+ * this configuration instance
+ *
+ * @see GenericObjectPool#getEvictorShutdownTimeoutMillis()
+ * @see GenericKeyedObjectPool#getEvictorShutdownTimeoutMillis()
+ */
+ public long getEvictorShutdownTimeoutMillis() {
+ return evictorShutdownTimeoutMillis;
+ }
+
+ /**
+ * Set the value for the {@code evictorShutdownTimeoutMillis} configuration
+ * attribute for pools created with this configuration instance.
+ *
+ * @param evictorShutdownTimeoutMillis The new setting of
+ * {@code evictorShutdownTimeoutMillis} for this configuration
+ * instance
+ *
+ * @see GenericObjectPool#getEvictorShutdownTimeoutMillis()
+ * @see GenericKeyedObjectPool#getEvictorShutdownTimeoutMillis()
+ */
+ public void setEvictorShutdownTimeoutMillis(
+ final long evictorShutdownTimeoutMillis) {
+ this.evictorShutdownTimeoutMillis = evictorShutdownTimeoutMillis;
+ }
+
+ /**
* Get the value for the {@code testOnCreate} configuration attribute for
* pools created with this configuration instance.
*
Copied:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/CallStack.java
(from r1817092,
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/CallStack.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/CallStack.java?p2=tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/CallStack.java&p1=tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/CallStack.java&r1=1817092&r2=1817279&rev=1817279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/CallStack.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/CallStack.java
Wed Dec 6 10:31:20 2017
@@ -20,8 +20,9 @@ import java.io.PrintWriter;
/**
* Strategy for obtaining and printing the current call stack. This is
primarily useful for
- * {@linkplain UsageTracking usage tracking} so that different JVMs and
configurations can use more efficient strategies
- * for obtaining the current call stack.
+ * {@link org.apache.tomcat.dbcp.pool2.UsageTracking usage tracking} so
+ * that different JVMs and configurations can use more efficient strategies
+ * for obtaining the current call stack depending on metadata needs.
*
* @see CallStackUtils
* @since 2.4.3
@@ -30,9 +31,9 @@ public interface CallStack {
/**
* Prints the current stack trace if available to a PrintWriter. The
format is undefined and is primarily useful
- * for debugging issues with {@link PooledObject} usage in user code.
+ * for debugging issues with {@link
org.apache.tomcat.dbcp.pool2.PooledObject} usage in user code.
*
- * @param writer a PrintWriter to write the curren stack trace to if
available
+ * @param writer a PrintWriter to write the current stack trace to if
available
* @return true if a stack trace was available to print or false if
nothing was printed
*/
boolean printStackTrace(final PrintWriter writer);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java
Wed Dec 6 10:31:20 2017
@@ -17,8 +17,6 @@
package org.apache.tomcat.dbcp.pool2.impl;
import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.Deque;
import org.apache.tomcat.dbcp.pool2.PooledObject;
@@ -44,8 +42,8 @@ public class DefaultPooledObject<T> impl
private volatile long lastUseTime = createTime;
private volatile long lastReturnTime = createTime;
private volatile boolean logAbandoned = false;
- private volatile Exception borrowedBy = null;
- private volatile Exception usedBy = null;
+ private volatile CallStack borrowedBy = NoOpCallStack.INSTANCE;
+ private volatile CallStack usedBy = NoOpCallStack.INSTANCE;
private volatile long borrowedCount = 0;
/**
@@ -191,7 +189,7 @@ public class DefaultPooledObject<T> impl
lastUseTime = lastBorrowTime;
borrowedCount++;
if (logAbandoned) {
- borrowedBy = new AbandonedObjectCreatedException();
+ borrowedBy.fillInStackTrace();
}
return true;
} else if (state == PooledObjectState.EVICTION) {
@@ -216,7 +214,7 @@ public class DefaultPooledObject<T> impl
state == PooledObjectState.RETURNING) {
state = PooledObjectState.IDLE;
lastReturnTime = System.currentTimeMillis();
- borrowedBy = null;
+ borrowedBy.clear();
return true;
}
@@ -234,22 +232,13 @@ public class DefaultPooledObject<T> impl
@Override
public void use() {
lastUseTime = System.currentTimeMillis();
- usedBy = new Exception("The last code to use this object was:");
+ usedBy.fillInStackTrace();
}
@Override
public void printStackTrace(final PrintWriter writer) {
- boolean written = false;
- final Exception borrowedByCopy = this.borrowedBy;
- if (borrowedByCopy != null) {
- borrowedByCopy.printStackTrace(writer);
- written = true;
- }
- final Exception usedByCopy = this.usedBy;
- if (usedByCopy != null) {
- usedByCopy.printStackTrace(writer);
- written = true;
- }
+ boolean written = borrowedBy.printStackTrace(writer);
+ written |= usedBy.printStackTrace(writer);
if (written) {
writer.flush();
}
@@ -286,41 +275,23 @@ public class DefaultPooledObject<T> impl
}
/**
- * Used to track how an object was obtained from the pool (the stack trace
- * of the exception will show which code borrowed the object) and when the
- * object was borrowed.
+ * Configures the stack trace generation strategy based on whether or not
fully
+ * detailed stack traces are required. When set to false, abandoned logs
may
+ * only include caller class information rather than method names, line
numbers,
+ * and other normal metadata available in a full stack trace.
+ *
+ * @param requireFullStackTrace the new configuration setting for
abandoned object
+ * logging
+ * @since 2.5
*/
- static class AbandonedObjectCreatedException extends Exception {
-
- private static final long serialVersionUID = 7398692158058772916L;
-
- /** Date format */
- //@GuardedBy("format")
- private static final SimpleDateFormat format = new SimpleDateFormat
- ("'Pooled object created' yyyy-MM-dd HH:mm:ss Z " +
- "'by the following code has not been returned to the pool:'");
-
- private final long _createdTime;
-
- /**
- * Create a new instance.
- * <p>
- * @see Exception#Exception()
- */
- public AbandonedObjectCreatedException() {
- super();
- _createdTime = System.currentTimeMillis();
- }
-
- // Override getMessage to avoid creating objects and formatting
- // dates unless the log message will actually be used.
- @Override
- public String getMessage() {
- String msg;
- synchronized(format) {
- msg = format.format(new Date(_createdTime));
- }
- return msg;
- }
+ // TODO: uncomment below in 3.0
+ // @Override
+ public void setRequireFullStackTrace(final boolean requireFullStackTrace) {
+ borrowedBy = CallStackUtils.newCallStack("'Pooled object created' " +
+ "yyyy-MM-dd HH:mm:ss Z 'by the following code has not been
returned to the pool:'",
+ true, requireFullStackTrace);
+ usedBy = CallStackUtils.newCallStack("The last code to use this object
was:",
+ false, requireFullStackTrace);
}
+
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObjectInfoMBean.java
Wed Dec 6 10:31:20 2017
@@ -41,7 +41,7 @@ public interface DefaultPooledObjectInfo
/**
* Obtain the time that pooled object was created.
*
- * @return The creation time for the pooled object formated as
+ * @return The creation time for the pooled object formatted as
* <code>yyyy-MM-dd HH:mm:ss Z</code>
*/
String getCreateTimeFormatted();
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java
Wed Dec 6 10:31:20 2017
@@ -18,16 +18,19 @@ package org.apache.tomcat.dbcp.pool2.imp
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.util.Timer;
import java.util.TimerTask;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
/**
- * Provides a shared idle object eviction timer for all pools. This class wraps
- * the standard {@link Timer} and keeps track of how many pools are using it.
- * If no pools are using the timer, it is canceled. This prevents a thread
- * being left running which, in application server environments, can lead to
- * memory leads and/or prevent applications from shutting down or reloading
- * cleanly.
+ * Provides a shared idle object eviction timer for all pools. This class is
+ * currently implemented using {@link ScheduledThreadPoolExecutor}. This
+ * implementation may change in any future release. This class keeps track of
+ * how many pools are using it. If no pools are using the timer, it is
cancelled.
+ * This prevents a thread being left running which, in application server
+ * environments, can lead to memory leads and/or prevent applications from
+ * shutting down or reloading cleanly.
* <p>
* This class has package scope to prevent its inclusion in the pool public
API.
* The class declaration below should *not* be changed to public.
@@ -38,17 +41,29 @@ import java.util.TimerTask;
*/
class EvictionTimer {
- /** Timer instance */
- private static Timer _timer; //@GuardedBy("EvictionTimer.class")
+ /** Executor instance */
+ private static ScheduledThreadPoolExecutor executor;
//@GuardedBy("EvictionTimer.class")
/** Static usage count tracker */
- private static int _usageCount; //@GuardedBy("EvictionTimer.class")
+ private static int usageCount; //@GuardedBy("EvictionTimer.class")
/** Prevent instantiation */
private EvictionTimer() {
// Hide the default constructor
}
+
+ /**
+ * @since 2.4.3
+ */
+ @Override
+ public String toString() {
+ final StringBuilder builder = new StringBuilder();
+ builder.append("EvictionTimer []");
+ return builder.toString();
+ }
+
+
/**
* Add the specified eviction task to the timer. Tasks that are added with
a
* call to this method *must* call {@link #cancel(TimerTask)} to cancel the
@@ -58,112 +73,57 @@ class EvictionTimer {
* @param delay Delay in milliseconds before task is executed
* @param period Time in milliseconds between executions
*/
- static synchronized void schedule(final TimerTask task, final long delay,
final long period) {
- if (null == _timer) {
- // Force the new Timer thread to be created with a context class
- // loader set to the class loader that loaded this library
- final ClassLoader ccl = AccessController.doPrivileged(
- new PrivilegedGetTccl());
- try {
- AccessController.doPrivileged(new PrivilegedSetTccl(
- EvictionTimer.class.getClassLoader()));
- _timer = AccessController.doPrivileged(new
PrivilegedNewEvictionTimer());
- } finally {
- AccessController.doPrivileged(new PrivilegedSetTccl(ccl));
- }
+ static synchronized void schedule(final Runnable task, final long delay,
final long period) {
+ if (null == executor) {
+ executor = new ScheduledThreadPoolExecutor(1, new
EvictorThreadFactory());
}
- _usageCount++;
- _timer.schedule(task, delay, period);
+ usageCount++;
+ executor.scheduleWithFixedDelay(task, delay, period,
TimeUnit.MILLISECONDS);
}
/**
* Remove the specified eviction task from the timer.
- * @param task Task to be scheduled
+ *
+ * @param task Task to be cancelled
+ * @param timeout If the associated executor is no longer required, how
+ * long should this thread wait for the executor to
+ * terminate?
+ * @param unit The units for the specified timeout
*/
- static synchronized void cancel(final TimerTask task) {
+ static synchronized void cancel(final TimerTask task, final long timeout,
final TimeUnit unit) {
task.cancel();
- _usageCount--;
- if (_usageCount == 0) {
- _timer.cancel();
- _timer = null;
- }
- }
-
- /**
- * {@link PrivilegedAction} used to get the ContextClassLoader
- */
- private static class PrivilegedGetTccl implements
PrivilegedAction<ClassLoader> {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ClassLoader run() {
- return Thread.currentThread().getContextClassLoader();
+ usageCount--;
+ if (usageCount == 0) {
+ executor.shutdown();
+ try {
+ executor.awaitTermination(timeout, unit);
+ } catch (final InterruptedException e) {
+ // Swallow
+ // Significant API changes would be required to propagate this
+ }
+ executor.setCorePoolSize(0);
+ executor = null;
}
}
/**
- * {@link PrivilegedAction} used to set the ContextClassLoader
+ * Thread factory that creates a thread, with the context classloader from
this class.
*/
- private static class PrivilegedSetTccl implements PrivilegedAction<Void> {
-
- /** ClassLoader */
- private final ClassLoader classLoader;
-
- /**
- * Create a new PrivilegedSetTccl using the given classloader
- * @param classLoader ClassLoader to use
- */
- PrivilegedSetTccl(final ClassLoader cl) {
- this.classLoader = cl;
- }
+ private static class EvictorThreadFactory implements ThreadFactory {
- /**
- * {@inheritDoc}
- */
@Override
- public Void run() {
- Thread.currentThread().setContextClassLoader(classLoader);
- return null;
- }
+ public Thread newThread(final Runnable r) {
+ final Thread t = new Thread(null, r,
"commons-pool-evictor-thread");
- @Override
- public String toString() {
- final StringBuilder builder = new StringBuilder();
- builder.append("PrivilegedSetTccl [classLoader=");
- builder.append(classLoader);
- builder.append("]");
- return builder.toString();
- }
- }
-
- /**
- * {@link PrivilegedAction} used to create a new Timer. Creating the timer
- * with a privileged action means the associated Thread does not inherit
the
- * current access control context. In a container environment, inheriting
- * the current access control context is likely to result in retaining a
- * reference to the thread context class loader which would be a memory
- * leak.
- */
- private static class PrivilegedNewEvictionTimer implements
PrivilegedAction<Timer> {
+ AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
+ public Void run() {
+
t.setContextClassLoader(EvictorThreadFactory.class.getClassLoader());
+ return null;
+ }
+ });
- /**
- * {@inheritDoc}
- */
- @Override
- public Timer run() {
- return new Timer("commons-pool-EvictionTimer", true);
+ return t;
}
}
-
- /**
- * @since 2.4.3
- */
- @Override
- public String toString() {
- final StringBuilder builder = new StringBuilder();
- builder.append("EvictionTimer []");
- return builder.toString();
- }
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java
Wed Dec 6 10:31:20 2017
@@ -51,6 +51,10 @@ import org.apache.tomcat.dbcp.pool2.Pool
* provided to one of these methods, a sub-new pool is created under the given
* key to be managed by the containing <code>GenericKeyedObjectPool.</code>
* <p>
+ * Note that the current implementation uses a ConcurrentHashMap which uses
+ * equals() to compare keys.
+ * This means that distinct instance keys must be distinguishable using equals.
+ * <p>
* Optionally, one may configure the pool to examine and possibly evict objects
* as they sit idle in the pool and to ensure that a minimum number of idle
* objects is maintained for each key. This is performed by an "idle object
@@ -144,7 +148,7 @@ public class GenericKeyedObjectPool<K,T>
* If maxIdlePerKey is set too low on heavily loaded systems it is possible
* you will see objects being destroyed and almost immediately new objects
* being created. This is a result of the active threads momentarily
- * returning objects faster than they are requesting them them, causing the
+ * returning objects faster than they are requesting them, causing the
* number of idle objects to rise above maxIdlePerKey. The best value for
* maxIdlePerKey for heavily loaded system will vary but the default is a
* good starting point.
@@ -164,7 +168,7 @@ public class GenericKeyedObjectPool<K,T>
* If maxIdlePerKey is set too low on heavily loaded systems it is possible
* you will see objects being destroyed and almost immediately new objects
* being created. This is a result of the active threads momentarily
- * returning objects faster than they are requesting them them, causing the
+ * returning objects faster than they are requesting them, causing the
* number of idle objects to rise above maxIdlePerKey. The best value for
* maxIdlePerKey for heavily loaded system will vary but the default is a
* good starting point.
@@ -252,6 +256,7 @@ public class GenericKeyedObjectPool<K,T>
setTimeBetweenEvictionRunsMillis(
conf.getTimeBetweenEvictionRunsMillis());
setEvictionPolicyClassName(conf.getEvictionPolicyClassName());
+
setEvictorShutdownTimeoutMillis(conf.getEvictorShutdownTimeoutMillis());
}
/**
@@ -521,7 +526,7 @@ public class GenericKeyedObjectPool<K,T>
final int maxIdle = getMaxIdlePerKey();
final LinkedBlockingDeque<PooledObject<T>> idleObjects =
- objectDeque.getIdleObjects();
+ objectDeque.getIdleObjects();
if (isClosed() || maxIdle > -1 && maxIdle <= idleObjects.size()) {
try {
@@ -736,7 +741,7 @@ public class GenericKeyedObjectPool<K,T>
// build sorted map of idle objects
final Map<PooledObject<T>, K> map = new TreeMap<>();
- for (Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
+ for (final Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
final K k = entry.getKey();
final ObjectDeque<T> deque = entry.getValue();
// Protect against possible NPE if key has been removed in another
@@ -756,7 +761,7 @@ public class GenericKeyedObjectPool<K,T>
// for zero
int itemsToRemove = ((int) (map.size() * 0.15)) + 1;
final Iterator<Map.Entry<PooledObject<T>, K>> iter =
- map.entrySet().iterator();
+ map.entrySet().iterator();
while (iter.hasNext() && itemsToRemove > 0) {
final Map.Entry<PooledObject<T>, K> entry = iter.next();
@@ -799,7 +804,7 @@ public class GenericKeyedObjectPool<K,T>
int maxQueueLength = 0;
LinkedBlockingDeque<PooledObject<T>> mostLoaded = null;
K loadedKey = null;
- for (Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
+ for (final Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
final K k = entry.getKey();
final ObjectDeque<T> deque = entry.getValue();
if (deque != null) {
@@ -837,11 +842,11 @@ public class GenericKeyedObjectPool<K,T>
* {@code false}
*/
private boolean hasBorrowWaiters() {
- for (Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
+ for (final Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
final ObjectDeque<T> deque = entry.getValue();
if (deque != null) {
final LinkedBlockingDeque<PooledObject<T>> pool =
- deque.getIdleObjects();
+ deque.getIdleObjects();
if(pool.hasTakeWaiters()) {
return true;
}
@@ -929,16 +934,16 @@ public class GenericKeyedObjectPool<K,T>
continue;
}
- // User provided eviction policy could throw all sorts of crazy
- // exceptions. Protect against such an exception killing the
- // eviction thread.
+ // User provided eviction policy could throw all sorts of
+ // crazy exceptions. Protect against such an exception
+ // killing the eviction thread.
boolean evict;
try {
evict = evictionPolicy.evict(evictionConfig, underTest,
poolMap.get(evictionKey).getIdleObjects().size());
} catch (final Throwable t) {
- // Slightly convoluted as SwallowedExceptionListener uses
- // Exception rather than Throwable
+ // Slightly convoluted as SwallowedExceptionListener
+ // uses Exception rather than Throwable
PoolUtils.checkRethrow(t);
swallowException(new Exception(t));
// Don't evict on error conditions
@@ -1208,7 +1213,7 @@ public class GenericKeyedObjectPool<K,T>
*/
private void ensureMinIdle(final K key) throws Exception {
// Calculate current pool objects
- final ObjectDeque<T> objectDeque = poolMap.get(key);
+ ObjectDeque<T> objectDeque = poolMap.get(key);
// objectDeque == null is OK here. It is handled correctly by both
// methods called below.
@@ -1222,6 +1227,12 @@ public class GenericKeyedObjectPool<K,T>
for (int i = 0; i < deficit && calculateDeficit(objectDeque) > 0; i++)
{
addObject(key);
+ // If objectDeque was null, it won't be any more. Obtain a
reference
+ // to it so the deficit can be correctly calculated. It needs to
+ // take account of objects created in other threads.
+ if (objectDeque == null) {
+ objectDeque = poolMap.get(key);
+ }
}
}
@@ -1399,7 +1410,7 @@ public class GenericKeyedObjectPool<K,T>
public Map<String,Integer> getNumWaitersByKey() {
final Map<String,Integer> result = new HashMap<>();
- for (Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
+ for (final Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
final K k = entry.getKey();
final ObjectDeque<T> deque = entry.getValue();
if (deque != null) {
@@ -1430,7 +1441,7 @@ public class GenericKeyedObjectPool<K,T>
final Map<String,List<DefaultPooledObjectInfo>> result =
new HashMap<>();
- for (Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
+ for (final Map.Entry<K, ObjectDeque<T>> entry : poolMap.entrySet()) {
final K k = entry.getKey();
final ObjectDeque<T> deque = entry.getValue();
if (deque != null) {
@@ -1450,6 +1461,8 @@ public class GenericKeyedObjectPool<K,T>
/**
* Maintains information on the per key queue for a given key.
+ *
+ * @param <S> type of objects in the pool
*/
private class ObjectDeque<S> {
@@ -1546,9 +1559,9 @@ public class GenericKeyedObjectPool<K,T>
private volatile int maxIdlePerKey =
GenericKeyedObjectPoolConfig.DEFAULT_MAX_IDLE_PER_KEY;
private volatile int minIdlePerKey =
- GenericKeyedObjectPoolConfig.DEFAULT_MIN_IDLE_PER_KEY;
+ GenericKeyedObjectPoolConfig.DEFAULT_MIN_IDLE_PER_KEY;
private volatile int maxTotalPerKey =
- GenericKeyedObjectPoolConfig.DEFAULT_MAX_TOTAL_PER_KEY;
+ GenericKeyedObjectPoolConfig.DEFAULT_MAX_TOTAL_PER_KEY;
private final KeyedPooledObjectFactory<K,T> factory;
private final boolean fairness;
@@ -1582,7 +1595,7 @@ public class GenericKeyedObjectPool<K,T>
// JMX specific attributes
private static final String ONAME_BASE =
- "org.apache.tomcat.dbcp.pool2:type=GenericKeyedObjectPool,name=";
+ "org.apache.tomcat.dbcp.pool2:type=GenericKeyedObjectPool,name=";
@Override
protected void toStringAppendFields(final StringBuilder builder) {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java
Wed Dec 6 10:31:20 2017
@@ -140,7 +140,7 @@ public class GenericObjectPool<T> extend
* is set too low on heavily loaded systems it is possible you will see
* objects being destroyed and almost immediately new objects being
created.
* This is a result of the active threads momentarily returning objects
- * faster than they are requesting them them, causing the number of idle
+ * faster than they are requesting them, causing the number of idle
* objects to rise above maxIdle. The best value for maxIdle for heavily
* loaded system will vary but the default is a good starting point.
*
@@ -159,7 +159,7 @@ public class GenericObjectPool<T> extend
* is set too low on heavily loaded systems it is possible you will see
* objects being destroyed and almost immediately new objects being
created.
* This is a result of the active threads momentarily returning objects
- * faster than they are requesting them them, causing the number of idle
+ * faster than they are requesting them, causing the number of idle
* objects to rise above maxIdle. The best value for maxIdle for heavily
* loaded system will vary but the default is a good starting point.
*
@@ -315,6 +315,7 @@ public class GenericObjectPool<T> extend
setSoftMinEvictableIdleTimeMillis(
conf.getSoftMinEvictableIdleTimeMillis());
setEvictionPolicyClassName(conf.getEvictionPolicyClassName());
+
setEvictorShutdownTimeoutMillis(conf.getEvictorShutdownTimeoutMillis());
}
/**
@@ -335,6 +336,7 @@ public class GenericObjectPool<T> extend
this.abandonedConfig.setRemoveAbandonedOnMaintenance(abandonedConfig.getRemoveAbandonedOnMaintenance());
this.abandonedConfig.setRemoveAbandonedTimeout(abandonedConfig.getRemoveAbandonedTimeout());
this.abandonedConfig.setUseUsageTracking(abandonedConfig.getUseUsageTracking());
+
this.abandonedConfig.setRequireFullStackTrace(abandonedConfig.getRequireFullStackTrace());
}
}
@@ -758,16 +760,16 @@ public class GenericObjectPool<T> extend
continue;
}
- // User provided eviction policy could throw all sorts of
crazy
- // exceptions. Protect against such an exception killing
the
- // eviction thread.
+ // User provided eviction policy could throw all sorts of
+ // crazy exceptions. Protect against such an exception
+ // killing the eviction thread.
boolean evict;
try {
evict = evictionPolicy.evict(evictionConfig, underTest,
idleObjects.size());
} catch (final Throwable t) {
- // Slightly convoluted as SwallowedExceptionListener
uses
- // Exception rather than Throwable
+ // Slightly convoluted as SwallowedExceptionListener
+ // uses Exception rather than Throwable
PoolUtils.checkRethrow(t);
swallowException(new Exception(t));
// Don't evict on error conditions
@@ -886,7 +888,7 @@ public class GenericObjectPool<T> extend
final PooledObject<T> p;
try {
p = factory.makeObject();
- } catch (Exception e) {
+ } catch (final Exception e) {
createCount.decrementAndGet();
throw e;
} finally {
@@ -899,6 +901,10 @@ public class GenericObjectPool<T> extend
final AbandonedConfig ac = this.abandonedConfig;
if (ac != null && ac.getLogAbandoned()) {
p.setLogAbandoned(true);
+ // TODO: in 3.0, this can use the method defined on PooledObject
+ if (p instanceof DefaultPooledObject<?>) {
+ ((DefaultPooledObject<T>)
p).setRequireFullStackTrace(ac.getRequireFullStackTrace());
+ }
}
createdCount.incrementAndGet();
@@ -1194,4 +1200,5 @@ public class GenericObjectPool<T> extend
builder.append(", abandonedConfig=");
builder.append(abandonedConfig);
}
+
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java
Wed Dec 6 10:31:20 2017
@@ -88,7 +88,11 @@ class LinkedBlockingDeque<E> extends Abs
private static final long serialVersionUID = -387911632671998426L;
- /** Doubly-linked list node class */
+ /**
+ * Doubly-linked list node class.
+ *
+ * @param <E> node item type
+ */
private static final class Node<E> {
/**
* The item, or null if this node has been removed.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
Wed Dec 6 10:31:20 2017
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.dbcp.pool2.impl;
+import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
import java.util.ArrayList;
@@ -375,7 +376,9 @@ public class SoftReferenceObjectPool<T>
// Remove wrappers for enqueued references from idle and allReferences
lists
removeClearedReferences(idleReferences.iterator());
removeClearedReferences(allReferences.iterator());
- while (refQueue.poll() != null) {}
+ while (refQueue.poll() != null) {
+ // empty
+ }
}
/**
Copied:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java
(from r1817092,
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java?p2=tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java&p1=tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java&r1=1817092&r2=1817279&rev=1817279&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/dbcp/pool2/impl/ThrowableCallStack.java
Wed Dec 6 10:31:20 2017
@@ -21,7 +21,9 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat;
/**
- * CallStack strategy that uses the stack trace from a {@link Throwable}.
+ * CallStack strategy that uses the stack trace from a {@link Throwable}. This
strategy, while slower than the
+ * SecurityManager implementation, provides call stack method names and other
metadata in addition to the call stack
+ * of classes.
*
* @see Throwable#fillInStackTrace()
* @since 2.4.3
@@ -34,15 +36,21 @@ public class ThrowableCallStack implemen
private volatile Snapshot snapshot;
+ /**
+ * Create a new instance.
+ *
+ * @param messageFormat message format
+ * @param useTimestamp whether to format the dates in the output message
or not
+ */
public ThrowableCallStack(final String messageFormat, final boolean
useTimestamp) {
this.messageFormat = messageFormat;
this.dateFormat = useTimestamp ? new SimpleDateFormat(messageFormat) :
null;
}
@Override
- public synchronized boolean printStackTrace(PrintWriter writer) {
- Snapshot snapshot = this.snapshot;
- if (snapshot == null) {
+ public synchronized boolean printStackTrace(final PrintWriter writer) {
+ final Snapshot snapshotRef = this.snapshot;
+ if (snapshotRef == null) {
return false;
}
final String message;
@@ -50,11 +58,11 @@ public class ThrowableCallStack implemen
message = messageFormat;
} else {
synchronized (dateFormat) {
- message = dateFormat.format(Long.valueOf(snapshot.timestamp));
+ message =
dateFormat.format(Long.valueOf(snapshotRef.timestamp));
}
}
writer.println(message);
- snapshot.printStackTrace(writer);
+ snapshotRef.printStackTrace(writer);
return true;
}
@@ -68,8 +76,11 @@ public class ThrowableCallStack implemen
snapshot = null;
}
+ /**
+ * A snapshot of a throwable.
+ */
private static class Snapshot extends Throwable {
- private static final long serialVersionUID = -7871548158947014789L;
+ private static final long serialVersionUID = 1L;
private final long timestamp = System.currentTimeMillis();
}
}
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1817279&r1=1817278&r2=1817279&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Dec 6 10:31:20 2017
@@ -91,6 +91,9 @@
Add missing SHA-512 hash for release artifacts to the build script.
(markt)
</fix>
+ <update>
+ Update the internal fork of Commons Pool 2 to 2.4.3. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
