[prev in list] [next in list] [prev in thread] [next in thread]
List: tomcat-dev
Subject: svn commit: r1767360 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apa
From: markt () apache ! org
Date: 2016-10-31 20:07:11
Message-ID: 20161031200712.047C63A1A7B () svn01-us-west ! apache ! org
[Download RAW message or body]
Author: markt
Date: Mon Oct 31 20:07:11 2016
New Revision: 1767360
URL: http://svn.apache.org/viewvc?rev=1767360&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60319
When using an Executor, disconnect it from the Connector attributes maxThreads \
minSpareThreads and threadPriority to enable the configuration settings to be \
consistently reported. These Connector attributes will be reported as -1 when an \
Executor is in use. The values used by the executor may be set and obtained via the \
Executor.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 31 20:07:11 2016
@@ -1,2 +1,2 @@
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892 \
,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,16403 \
61,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,164 \
0976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1 \
641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720 \
-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,16426 \
79,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,164 \
3206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1 \
643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654 \
,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,16441 \
69,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,164 \
5355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1 \
645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106 \
,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-16467 \
23,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,165 \
0365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1 \
653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050 \
,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,16547 \
66,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,165 \
5132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1 \
656331,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-165918 \
9,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659 \
486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,16 \
59862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133, \
1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,166199 \
0,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663 \
264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,16 \
63893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710, \
1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,166569 \
7,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,16669 \
72,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,166 \
7688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1 \
669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598 \
-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,16722 \
84,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,167 \
6381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1 \
677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534 \
,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,16812 \
86,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-168 \
1838,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,16 \
87242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,1688885,1688896, \
1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,168985 \
6,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692 \
747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,16 \
94501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379, \
1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,169639 \
0,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701 \
213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,17 \
02246,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,17035 \
09,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,170 \
3784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1 \
704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647 \
,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-17047 \
42,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,170 \
5842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1 \
707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120 \
,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,17104 \
41,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,1712 \
547-1712548,1712588,1712617,1712645,1712654,1712695,1712765-1712766,1712771,1712775,17 \
12859,1712876,1712898,1712902,1712905,1712912,1712974,1713129,1713168,1713184,1713285, \
1713362,1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,171399 \
7,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715168,1715188,1715206,1715 \
413,1715415,1715434,1715510-1715512,1715514-1715515,1715517-1715519,1715521,1715633,17 \
15661,1715682,1715965,1716213-1716214,1716258,1716269,1716347,1716354,1716364,1716413, \
1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882,1716886,171689 \
4,1717085,1717225,1717233,1717252,1717264,1717282,1717286,1717290,1717385,1717416,1717 \
418,1717445,1717515,1717520,1717528,1717965,1717967-1717968,1717979,1718022,1718308,17 \
18523,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-1 \
720655,1720711,1720752,1720769,1720776,1720804,1720815,1721303,1721307,1721311,1721314 \
,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1721866,1721881,1721887,17222 \
05,1722292,1722399,1722453,1722455,1722522,1722526,1722532,1722548,1722574,1722583,172 \
2585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,1722923,1 \
722939,1722945,1722996,1723068,1723127,1723155,1723250,1723316-1723318,1723368,1723371 \
,1723375,1723377,1723380,1723410,1723414,1723437,1723484,1723486,1723493-1723494,17235 \
00,1723552,1723554,1723683,1723707,1723736,1724012,1724232,1724252,1724325,1724427-172 \
4428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1 \
725165,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,172666 \
9,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727 \
899,1727914,1727917,1728091,1728138,1728433,1728448,1728664,1728677,1729185,1729361,17 \
29625,1729730,1730101-1730102,1730137,1730612,1730946-1730975,1731008,1731055,1731079, \
1731283,1731856,1731882,1731946-1731958,1731976-1731983,1732359,1732488,1732900-173344 \
8,1733602,1733617-1733963,1733978,1734113,1734128,1734192,1734258,1734301,1734418-1734 \
454,1734466-1734512,1734522,1734592,1734594,1734597,1735041,1735577,1736162,1736209,17 \
36280,1736646,1736836,1737119,1737280,1737339,1737632,1737664,1737715,1737834,1737903, \
1737959,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,173814 \
9,1738174-1738175,1738643,1738850,1738982,1738996,1739079-1739081,1739087,1739113,1739 \
153,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,174 \
1208,1741213,1741221,1741225,1741232,1741409,1741677,1741892,1741896,1742071,1742090,1 \
742093,1742101,1742105,1742111,1742146,1742166,1742181,1742184,1742187,1742246,1742248 \
-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742919,1742975,17429 \
84,1742986,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697,174 \
3700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1 \
744684,1744697,1744705,1744760,1745227,1745337,1746306,1746427,1746473,1746620,1746649 \
,1746724,1746939,1746989,1747536,1747924,1748001,1748547,1748629,1748715,1749287,17493 \
28,1749665-1749666,1750015,1750056,1750899,1750975,1750995,1751061,1751097,1752212,175 \
2737,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1 \
754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755214,1755224,1755230,1755646-1755
647,1755650,1755675,1755693,1755717,1755884,1755890,1755918-1755919,1755942,1756013, \
1756019,1756039,1756408,1756410,1756898,1756939,1757123-1757124,1757126,1757128,175713 \
2-1757133,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757 \
353-1757354,1757363,1757374,1757399,1757406,1757408,1757495,1757499,1757527,1757997,17 \
58072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758486- \
1758487,1758499,1758556,1758582,1758584,1758588,1758842,1759019,1759224,1759227,175925 \
2,1759274,1759513-1759516,1759611,1760022,1760300,1760397,1760446,1760454,1760640,1760 \
648,1761057,1761491,1761498,1761500-1761501,1761550,1761625-1761626,1761628,1761682,17 \
61740,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374, \
1762541,1762608,1762710,1762766,1762769,1762944,1762947,1762953,1763167,1763179,176323 \
2,1763259,1763271-1763272,1763276,1763319,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763512,1763574,1763634-1763635,1763718,1
763786,1763798-1763799,1764083,1764659,1764682,1764897,1765299,1765358,1765439,1765571,1766276
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,163789 \
2,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640 \
361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,16 \
40976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300, \
1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,164172 \
0-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642 \
679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,16 \
43206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365- \
1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,164365 \
4,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644 \
169,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,164 \
5355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1 \
645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106 \
,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-16467 \
23,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,165 \
0365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1 \
653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050 \
,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,16547 \
66,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,165 \
5132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1 \
656331,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-165918 \
9,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659 \
486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,16 \
59862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133, \
1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,166199 \
0,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663 \
264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,16 \
63893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710, \
1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,166569 \
7,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,16669 \
72,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,166 \
7688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1 \
669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598 \
-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,16722 \
84,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,167 \
6381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1 \
677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534 \
,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,16812 \
86,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-168 \
1838,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,16 \
87242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,1688885,1688896, \
1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,168985 \
6,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692 \
747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,16 \
94501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379, \
1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,169639 \
0,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701 \
213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,17 \
02246,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,17035 \
09,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,170 \
3784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1 \
704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647 \
,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-17047 \
42,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,170 \
5842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1 \
707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120 \
,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,17104 \
41,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,1712 \
547-1712548,1712588,1712617,1712645,1712654,1712695,1712765-1712766,1712771,1712775,17 \
12859,1712876,1712898,1712902,1712905,1712912,1712974,1713129,1713168,1713184,1713285, \
1713362,1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,171399 \
7,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715168,1715188,1715206,1715 \
413,1715415,1715434,1715510-1715512,1715514-1715515,1715517-1715519,1715521,1715633,17 \
15661,1715682,1715965,1716213-1716214,1716258,1716269,1716347,1716354,1716364,1716413, \
1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882,1716886,171689 \
4,1717085,1717225,1717233,1717252,1717264,1717282,1717286,1717290,1717385,1717416,1717 \
418,1717445,1717515,1717520,1717528,1717965,1717967-1717968,1717979,1718022,1718308,17 \
18523,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-1 \
720655,1720711,1720752,1720769,1720776,1720804,1720815,1721303,1721307,1721311,1721314 \
,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1721866,1721881,1721887,17222 \
25926,1726177,1726202,1726628,1726632,1726637,1726639,1726648,1726651,1726654,1726669 \
,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,17278 \
99,1727914,1727917,1728091,1728138,1728433,1728448,1728664,1728677,1729185,1729361,172 \
9625,1729730,1730101-1730102,1730137,1730612,1730946-1730975,1731008,1731055,1731079,1 \
731283,1731856,1731882,1731946-1731958,1731976-1731983,1732359,1732488,1732900-1733448 \
,1733602,1733617-1733963,1733978,1734113,1734128,1734192,1734258,1734301,1734418-17344 \
54,1734466-1734512,1734522,1734592,1734594,1734597,1735041,1735577,1736162,1736209,173 \
6280,1736646,1736836,1737119,1737280,1737339,1737632,1737664,1737715,1737834,1737903,1 \
737959,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149 \
,1738174-1738175,1738643,1738850,1738982,1738996,1739079-1739081,1739087,1739113,17391 \
53,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,174 \
1208,1741213,1741221,1741225,1741232,1741409,1741677,1741892,1741896,1742071,1742090,1 \
742093,1742101,1742105,1742111,1742146,1742166,1742181,1742184,1742187,1742246,1742248 \
-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742919,1742975,17429 \
84,1742986,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697,174 \
3700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1 \
744684,1744697,1744705,1744760,1745227,1745337,1746306,1746427,1746473,1746620,1746649 \
,1746724,1746939,1746989,1747536,1747924,1748001,1748547,1748629,1748715,1749287,17493 \
28,1749665-1749666,1750015,1750056,1750899,1750975,1750995,1751061,1751097,1752212,175 \
2737,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1 \
754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755214,1755224,1755230,1755646-1755
647,1755650,1755675,1755693,1755717,1755884,1755890,1755918-1755919,1755942,1756013, \
1756019,1756039,1756408,1756410,1756898,1756939,1757123-1757124,1757126,1757128,175713 \
2-1757133,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757 \
353-1757354,1757363,1757374,1757399,1757406,1757408,1757495,1757499,1757527,1757997,17 \
58072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758486- \
1758487,1758499,1758556,1758582,1758584,1758588,1758842,1759019,1759224,1759227,175925 \
2,1759274,1759513-1759516,1759611,1760022,1760300,1760397,1760446,1760454,1760640,1760 \
648,1761057,1761491,1761498,1761500-1761501,1761550,1761625-1761626,1761628,1761682,17 \
61740,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374, \
1762541,1762608,1762710,1762766,1762769,1762944,1762947,1762953,1763167,1763179,176323 \
2,1763259,1763271-1763272,1763276,1763319,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763512,1763574,1763634-1763635,1763718,1
763786,1763798-1763799,1764083,1764659,1764682,1764897,1765299,1765358,1765439,1765571,1766276,1767328
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1767360&r1=1767359&r2=1767360&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml \
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml \
Mon Oct 31 20:07:11 2016 @@ -117,11 +117,11 @@
<!-- Common -->
<attribute name="maxThreads"
- description="The maximum number of request processing threads to be \
created" + description="The maximum number of request processing threads to \
be created for the internal Executor. -1 indicates an external Executor is being \
used." type="int"/>
<attribute name="minSpareThreads"
- description="The number of request processing threads that will be \
created" + description="The number of request processing threads that will \
be created for the internal Executor. -1 indicates an external Executor is being \
used." type="int"/>
<!-- Common -->
@@ -188,7 +188,7 @@
<!-- Common -->
<attribute name="threadPriority"
- description="The thread priority for processors"
+ description="The thread priority for processors using the internal \
Executor. -1 indicates an external Executor is being used." type="int"/>
<attribute name="URIEncoding"
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1767360&r1=1767359&r2=1767360&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java \
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon \
Oct 31 20:07:11 2016 @@ -173,7 +173,7 @@ public abstract class AbstractEndpoint<S
/**
* Are we using an internal executor
*/
- protected volatile boolean internalExecutor = false;
+ protected volatile boolean internalExecutor = true;
/**
@@ -369,21 +369,29 @@ public abstract class AbstractEndpoint<S
private int minSpareThreads = 10;
- public int getMinSpareThreads() {
- return Math.min(minSpareThreads,getMaxThreads());
- }
public void setMinSpareThreads(int minSpareThreads) {
this.minSpareThreads = minSpareThreads;
Executor executor = this.executor;
- if (running && executor != null) {
- if (executor instanceof java.util.concurrent.ThreadPoolExecutor) {
- ((java.util.concurrent.ThreadPoolExecutor) \
executor).setCorePoolSize(minSpareThreads);
- } else if (executor instanceof ResizableExecutor) {
- ((ResizableExecutor) executor).resizePool(minSpareThreads, \
maxThreads);
- }
+ if (internalExecutor && executor instanceof \
java.util.concurrent.ThreadPoolExecutor) { + // The internal executor \
should always be an instance of + // j.u.c.ThreadPoolExecutor but it may \
be null if the endpoint is + // not running.
+ // This check also avoids various threading issues.
+ ((java.util.concurrent.ThreadPoolExecutor) \
executor).setCorePoolSize(minSpareThreads); + }
+ }
+ public int getMinSpareThreads() {
+ return Math.min(getMinSpareThreadsInternal(), getMaxThreads());
+ }
+ private int getMinSpareThreadsInternal() {
+ if (internalExecutor) {
+ return minSpareThreads;
+ } else {
+ return -1;
}
}
+
/**
* Maximum amount of worker threads.
*/
@@ -391,32 +399,43 @@ public abstract class AbstractEndpoint<S
public void setMaxThreads(int maxThreads) {
this.maxThreads = maxThreads;
Executor executor = this.executor;
- if (running && executor != null) {
- if (executor instanceof java.util.concurrent.ThreadPoolExecutor) {
- ((java.util.concurrent.ThreadPoolExecutor) \
executor).setMaximumPoolSize(maxThreads);
- } else if (executor instanceof ResizableExecutor) {
- ((ResizableExecutor) executor).resizePool(minSpareThreads, \
maxThreads);
- }
+ if (internalExecutor && executor instanceof \
java.util.concurrent.ThreadPoolExecutor) { + // The internal executor \
should always be an instance of + // j.u.c.ThreadPoolExecutor but it may \
be null if the endpoint is + // not running.
+ // This check also avoids various threading issues.
+ ((java.util.concurrent.ThreadPoolExecutor) \
executor).setMaximumPoolSize(maxThreads); }
}
public int getMaxThreads() {
- return getMaxThreadsExecutor(running);
+ if (internalExecutor) {
+ return maxThreads;
+ } else {
+ return -1;
+ }
}
- protected int getMaxThreadsExecutor(boolean useExecutor) {
- Executor executor = this.executor;
- if (useExecutor && executor != null) {
- if (executor instanceof java.util.concurrent.ThreadPoolExecutor) {
- return \
((java.util.concurrent.ThreadPoolExecutor)executor).getMaximumPoolSize();
- } else if (executor instanceof ResizableExecutor) {
- return ((ResizableExecutor)executor).getMaxThreads();
- } else {
- return -1;
- }
+ protected int getMaxThreadsInternal() {
+ return maxThreads;
+ }
+
+
+ /**
+ * Priority of the worker threads.
+ */
+ protected int threadPriority = Thread.NORM_PRIORITY;
+ public void setThreadPriority(int threadPriority) {
+ // Can't change this once the executor has started
+ this.threadPriority = threadPriority;
+ }
+ public int getThreadPriority() {
+ if (internalExecutor) {
+ return threadPriority;
} else {
- return maxThreads;
+ return -1;
}
}
+
/**
* Max keep alive requests
*/
@@ -457,13 +476,6 @@ public abstract class AbstractEndpoint<S
public boolean getDaemon() { return daemon; }
- /**
- * Priority of the worker threads.
- */
- protected int threadPriority = Thread.NORM_PRIORITY;
- public void setThreadPriority(int threadPriority) { this.threadPriority = \
threadPriority; }
- public int getThreadPriority() { return threadPriority; }
-
protected abstract boolean getDeferAccept();
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=1767360&r1=1767359&r2=1767360&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Mon Oct 31 \
20:07:11 2016 @@ -348,7 +348,7 @@ public class JIoEndpoint extends Abstrac
// Initialize maxConnections
if (getMaxConnections() == 0) {
// User hasn't set a value - use the default
- setMaxConnections(getMaxThreadsExecutor(true));
+ setMaxConnections(getMaxThreadsInternal());
}
if (serverSocketFactory == null) {
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1767360&r1=1767359&r2=1767360&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Oct 31 20:07:11 2016
@@ -79,6 +79,15 @@
Correct the HTTP header parser so that DEL is not treated as a valid
token character. (markt)
</fix>
+ <fix>
+ <bug>60319</bug>: When using an Executor, disconnect it from the
+ Connector attributes <code>maxThreads</code>,
+ <code>minSpareThreads</code> and <code>threadPriority</code> to enable
+ the configuration settings to be consistently reported. These Connector
+ attributes will be reported as <code>-1</code> when an Executor is in
+ use. The values used by the executor may be set and obtained via the
+ Executor. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml?rev=1767360&r1=1767359&r2=1767360&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/ajp.xml Mon Oct 31 20:07:11 2016
@@ -404,12 +404,20 @@
maximum number of simultaneous requests that can be handled. If
not specified, this attribute is set to 200. If an executor is associated
with this connector, this attribute is ignored as the connector will
- execute tasks using the executor rather than an internal thread pool.</p>
+ execute tasks using the executor rather than an internal thread pool. Note
+ that if an executor is configured any value set for this attribute will be
+ recorded correctly but it will be reported (e.g. via JMX) as
+ <code>-1</code> to make clear that it is not used.</p>
</attribute>
<attribute name="minSpareThreads" required="false">
<p>The minimum number of threads always kept running. If not specified,
- the default of <code>10</code> is used.</p>
+ the default of <code>10</code> is used. If an executor is associated
+ with this connector, this attribute is ignored as the connector will
+ execute tasks using the executor rather than an internal thread pool. Note
+ that if an executor is configured any value set for this attribute will be
+ recorded correctly but it will be reported (e.g. via JMX) as
+ <code>-1</code> to make clear that it is not used.</p>
</attribute>
<attribute name="packetSize" required="false">
@@ -448,8 +456,12 @@
The default value is <code>5</code> (the value of the
<code>java.lang.Thread.NORM_PRIORITY</code> constant). See the JavaDoc
for the <code>java.lang.Thread</code> class for more details on what
- this priority means.
- </p>
+ this priority means.If an executor is associated
+ with this connector, this attribute is ignored as the connector will
+ execute tasks using the executor rather than an internal thread pool. Note
+ that if an executor is configured any value set for this attribute will be
+ recorded correctly but it will be reported (e.g. via JMX) as
+ <code>-1</code> to make clear that it is not used.</p>
</attribute>
<attribute name="tomcatAuthentication" required="false">
Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml?rev=1767360&r1=1767359&r2=1767360&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/http.xml Mon Oct 31 20:07:11 2016
@@ -479,7 +479,10 @@
maximum number of simultaneous requests that can be handled. If
not specified, this attribute is set to 200. If an executor is associated
with this connector, this attribute is ignored as the connector will
- execute tasks using the executor rather than an internal thread pool.</p>
+ execute tasks using the executor rather than an internal thread pool. Note
+ that if an executor is configured any value set for this attribute will be
+ recorded correctly but it will be reported (e.g. via JMX) as
+ <code>-1</code> to make clear that it is not used.</p>
</attribute>
<attribute name="maxTrailerSize" required="false">
@@ -491,7 +494,12 @@
<attribute name="minSpareThreads" required="false">
<p>The minimum number of threads always kept running. If not specified,
- the default of <code>10</code> is used.</p>
+ the default of <code>10</code> is used. If an executor is associated
+ with this connector, this attribute is ignored as the connector will
+ execute tasks using the executor rather than an internal thread pool. Note
+ that if an executor is configured any value set for this attribute will be
+ recorded correctly but it will be reported (e.g. via JMX) as
+ <code>-1</code> to make clear that it is not used.</p>
</attribute>
<attribute name="noCompressionUserAgents" required="false">
@@ -561,8 +569,12 @@
The default value is <code>5</code> (the value of the
<code>java.lang.Thread.NORM_PRIORITY</code> constant). See the JavaDoc
for the <code>java.lang.Thread</code> class for more details on what
- this priority means.
- </p>
+ this priority means. If an executor is associated
+ with this connector, this attribute is ignored as the connector will
+ execute tasks using the executor rather than an internal thread pool. Note
+ that if an executor is configured any value set for this attribute will be
+ recorded correctly but it will be reported (e.g. via JMX) as
+ <code>-1</code> to make clear that it is not used.</p>
</attribute>
<attribute name="upgradeAsyncWriteBufferSize" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic