[prev in list] [next in list] [prev in thread] [next in thread]
List: tomcat-dev
Subject: svn commit: r1803449 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/WebAnnotationSe
From: markt () apache ! org
Date: 2017-07-30 18:28:47
Message-ID: 20170730182847.2D6793A0166 () svn01-us-west ! apache ! org
[Download RAW message or body]
Author: markt
Date: Sun Jul 30 18:28:46 2017
New Revision: 1803449
URL: http://svn.apache.org/viewvc?rev=1803449&view=rev
Log:
Refactor to simplify code and to remove a FindBugs warning
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 30 18:28:46 2017
@@ -1,3 +1,3 @@
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349 \
,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,16413 \
75,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,164 \
2701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1 \
643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018 \
,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,16459 \
03-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-164 \
6741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1 \
651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161 \
,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,16635 \
67,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988
,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,166 \
8137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1 \
670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759 \
,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,16763 \
94,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,168 \
1730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1 \
682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892 \
,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,16941 \
15,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,169 \
5823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1 \
701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702
739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779, \
1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,171222 \
6,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712 \
913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,17 \
13998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637, \
1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,171641 \
4,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718 \
797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,17 \
20442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831, \
1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,172344 \
0,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,17262 \
03,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,172 \
8092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1 \
731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166 \
,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,17342 \
61,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,173 \
9294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1 \
744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173 \
,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,17741 \
04,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,178 \
9140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,1802814
-/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165 \
,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,17409 \
81,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,174 \
3118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232,1 \
744377,1744687,1744698,1744706,1745228,1746940,1748548,1748716,1749288,1749375,1749668 \
-1749669,1750016,1750057,1750976,1751000,1751062,1751098,1754112,1754144,1754282,17543 \
12,1754614,1754726,1754806,1754878,1754889,1754894,1754900,1754945,1754954,1754958,175 \
5891,1755944,1756040,1756412,1756940,1757134,1757176,1757203,1757272,1757282,1757348,1 \
757355,1757423,1757501,1757535,1758488,1758493,1758500,1758589,1759275,1761629,1761741 \
,1762124,1762297,1762354-1762355,1762358,1762375,1762770,1763233,1763413,1763513,17635 \
78,1765591,1765596,1767357,1767370,1770658,1770667,1770719,1770763,1771387,1771964,1772175,1772230,1772630,1772850,1772948,1773419,1773816
-1773817,1774137,1774250,1774306-1774307,1774309,1774342,1774413,1777014,1777174,1777 \
547,1778065,1779655,1779900,1780110,1780263,1780265,1781600,1781987,1782037,1782240,17 \
82386-1782387,1782815,1782860,1782870,1782948,1783157,1784658,1784670,1784713,1784752, \
1785669,1785763,1785775,1786033,1786039,1786072,1786131,1786343,1786845,1788249,178832 \
4,1788329,1788905,1789216,1789335,1789482,1790377,1791528,1791558,1792461,1792469,1793 \
469,1793488,1793499,1793503,1793518,1793822,1795299,1795894,1796698,1796810,1796837,17 \
96879,1797339,1797357-1797358,1797521,1797697-1797699,1797750,1797829,1798372,1798380, \
1798385,1798543,1799116,1799127,1799162,1799165,1799192,1799195,1799286,1799369,179990 \
0-1799901,1799908,1799932,1800143,1800310,1800455,1800469,1800474,1800792,1800818,1800 \
982,1800985,1800989,1801531,1801541,1801693,1801775,1801779,1802084,1802782,1802789,1802805,1802821,1802829,1802834,1802837,1803168
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349 \
-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-11759 \
32,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,118 \
7755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1 \
188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345 \
,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-12121 \
25,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-122 \
2795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1 \
226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627 \
-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,12379 \
95,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-124 \
1822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1 \
292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108 \
,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-13026 \
10,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,130 \
4011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1 \
304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511 \
-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,13119 \
95,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,133 \
5692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1 \
337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629, \
1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,134462 \
9,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345 \
290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,13 \
45704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107, \
1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,134679 \
4,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348 \
357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,13 \
48968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879, \
1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,135086 \
4,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,13535 \
01,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,135 \
4685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1 \
356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102 \
,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1360946,13612 \
13,1361263,1361430,1361754-1361755,1361760,1361762,1361769,1361772,1361796,1361962,136 \
1982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1 \
366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370382,1370386 \
,1370441,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,13710 \
17,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,137 \
2131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,1373993,1374000,137401
9,1374073,1374086,1374823,1376994,1377078,1377292,1377311,1377321,1377342,1377433,13 \
77444,1377516,1377518-1377519,1377532,1377535,1377544,1377689,1377785,1377794,1377811, \
1377824,1377827,1377831,1377852-1377853,1377887,1377900,1378322,1378361,1378394,137869 \
9,1378715,1378730,1378733-1378734,1378818,1378868,1378918,1379047,1379090,1379178,1379 \
206,1379213,1379418,1379580,1379590,1379639,1379647,1379649,1379665,1379733,1379735,13 \
80066,1380073,1380075,1380376,1380381,1380635,1380637,1380722,1380793,1380838,1381411, \
1381623,1382314,1382343,1382366,1382515,1382832,1382842,1384051,1384055,1384063,138406 \
8-1384069,1385336,1387937,1388709,1388890,1390882,1392098,1392619,1392649,1392652,1393 \
071,1393115,1396615,1396723,1397086,1397464,1397466,1397472,1397482,1397484,1397839,13 \
97868,1397873,1397944,1397950,1397953,1397957,1397960,1397962,1397964,1397969,1397971- \
1397974,1397976-1397980,1397985,1397988-1397989,1398089,1398107,1398109-1398110,1398112,1399022,1399563,1401472,1401792,1401808,1401814,140
2113,1402122,1402345,1402348,1402350,1402428,1402573,1402576,1402600-1402601,1402622 \
,1402643,1402683,1402705,1402837,1402855,1403099,1403468,1404374,1404658,1404704,14047 \
73,1404917-1404918,1405133,1405168,1405321,1405353,1405357,1405364,1405397,1405399-140 \
5400,1405415,1405435,1405676,1405681,1406140,1406394,1406456,1406481,1406526,1406788,1 \
407595,1407619,1408043,1408148,1408154,1408156,1408159,1408163-1408165,1408248,1408438 \
,1408504,1408513-1408517,1408562-1408565,1408714,1408721,1408739,1408750,1408774,14087 \
92,1408872-1408876,1408906,1408934,1409007,1409030,1410466,1410545,1410609,1410611,141 \
0632,1410714,1410732,1410740,1410742,1410763-1410764,1410766,1411585,1411993,1412575,1 \
413552,1413556,1413562,1414053,1414113,1414215,1414889,1415177-1415179,1415186,1416458 \
,1416481,1416501,1416529,1416534-1416535,1416658,1417194,1417201,1417224,1417282,14173 \
47-1417348,1417353,1417363,1417365,1417370-1417372,1417463,1417465,1417467,1417469,1417476,1424894,1425502,1425514,1425564,1425628,1426662,
1427013,1427757,1427784,1427804,1427846,1428010,1428079,1428283,1428355,1428403,1428 \
643,1428869,1428959,1428993,1429123,1429153,1429167,1429173,1429179-1429180,1429182,14 \
29356,1429687,1429745,1429784,1429836,1429863,1429946,1429969,1430079,1430147,1430165, \
1430445,1430448,1430481,1430487,1430508,1430550,1430567,1430771,1430773,1430775,143079 \
1,1430799,1430806,1430809,1430921,1431164,1431171,1431206,1431221,1431293,1431298,1431 \
302,1431308,1431310,1431320,1431398,1431661,1431920,1431990,1432516-1432517,1432842,14 \
32845,1432867,1433976,1434403,1434428,1434438,1434447,1434456,1434463,1434500,1434598, \
1434660,1434685,1434719,1434723,1434725,1434749,1434757,1434882,1435126,1435505,143550 \
9,1435600,1435606,1435636,1435642,1435759-1435760,1435765,1435767,1437317,1437337,1437 \
505,1437637,1437649,1437743,1437891,1437897,1437903,1438411,1438463,1439054,1439334,14 \
39434,1439442,1439445,1439667,1440095,1440622,1440911,1441342,1441348,1441403,1441416,1441428,1441807,1441895,1441916,1441920,1443350,14434
05,1443427,1445111,1445125,1445190,1445208,1445212,1445328,1445337,1445520,1446108,1 \
446137,1446357,1446612,1446640,1446650,1447012,1447178,1447791,1447817-1447818,1448117 \
,1448121,1448125,1448679,1448826,1449225,1449406,1450990,1451053,1451061,1451105,14514 \
08,1451434,1451769,1451938-1451939,1451947,1451955-1451956,1452295,1452501,1452707,145 \
2719,1452721,1452752,1453105,1453112,1453435,1453439,1453490,1453544,1453549,1453621,1 \
454828,1454832,1454953,1455344,1455854,1455973,1456083,1456440,1456453,1456491,1456494 \
,1456657,1456666,1456678,1456706,1456713,1456716,1456721,1456740,1456762,1456766,14568 \
22,1456844,1456863,1456872,1456882,1456885,1456895,1456899,1456904,1456916,1456920,145 \
6926,1456932,1456959,1456963,1456970,1457299,1457301,1457362,1457382,1457402,1457452,1 \
457748,1457968,1458187,1458192,1458200,1458221,1458562,1458564-1458565,1458694,1458726 \
,1458738-1458739,1459010,1459028,1459031,1459061,1459074-1459075,1459085,1459218,1459223,1459289,1459389,1459523-1459524,1459673,1459681,14
59761,1459769,1459933,1460107,1460115,1460234,1460313,1460330,1460342,1460533,146063 \
3,1460679,1460873,1461026,1461110,1461341,1461349,1461849,1464781,1465795,1465807,1466 \
051,1466072,1466106,1467091,1468415,1470400,1470435,1470765,1471371,1471632,1475750,14 \
75791,1475900,1475930,1475968,1476761,1476805,1476815,1476972,1477051,1478857,1479175, \
1479179,1479248,1479482,1479951,1481164,1481835,1482115,1482288,1482309,1482311,148231 \
3,1482321,1482591,1482720,1482723,1482799,1482835,1482854,1483104,1483229,1483288,1483 \
360-1483361,1483390,1483552,1483554,1483679,1483743-1483744,1483786-1483787,1483816-14 \
83817,1483949,1484253,1484592,1484780,1484786,1484861-1484862,1484959,1485114,1485489, \
1485495,1485611,1485847,1485862,1486062,1486134,1486217,1486294,1486443,1486834,148686 \
1,1486875,1486890,1486939,1487862,1487882,1488151,1488793,1489170,1489195-1489196,1489 \
201,1489385,1489390,1489405,1489437,1489536,1489546,1489610,1489633,1489648,1489738,1489812,1489886,1491485,1491596,1491709,1491841,1491890
,1491940,1491942,1492307,1492336,1492343,1492358,1492555,1492570,1493011,1493013-149 \
3014,1493071,1493113,1493584,1493615,1493729,1493740,1493801,1493910,1494044,1494048,1 \
494051,1494056,1494143,1495015,1495043,1495154,1495197,1495880,1495886,1496061,1496732 \
,1496734,1497474,1497538,1497754,1498340,1498363,1498368,1498409,1498475,1498482,14984 \
98,1498669,1498698,1498808,1499371,1499388,1499513,1499953,1500003,1500062,1500371,150 \
0380,1500577,1500590,1500663,1501176,1501266,1501304,1501719,1501738,1501823,1501910,1 \
501927,1501929,1502254,1502349,1503851,1505843,1505929,1506053,1507013,1507052,1507096 \
,1507870,1507872,1508196,1508259,1508346,1509128,1509151,1509156,1509161,1509806,15102 \
46,1510271,1510488,1511212,1511217,1511434,1512034,1513025,1513148-1513149,1513665,151 \
4281,1514291,1514305,1514368,1514470,1514485-1514486,1515841,1515926,1516113,1516295,1 \
516419,1516710,1516953,1517536,1517898,1517941,1517970,1517980,1518189,1518210,1518328,1518381,1518536,1518540,1518578,1518581,1518589,1519
611,1519623,1519627,1520273,1520349,1520632,1520655,1521023,1521025,1521027,1521030, \
1521032,1521034,1521040,1521043,1521049-1521050,1521059-1521061,1521073,1521075,152127 \
1,1521276,1521444,1521687,1521829,1521831,1521834-1521835,1521837,1521839-1521840,1522 \
016,1523555,1523646-1523647,1523674,1523781,1523788,1523830,1523955,1523958,1523964,15 \
23982,1524078,1524558,1524652,1524657,1524668,1524683,1524687,1524707,1524719,1524727, \
1524761,1524978,1524984,1525593,1525696,1526043,1526052,1526730,1527480,1527493,152772 \
7-1527728,1527730-1527733,1528060,1528166,1528169,1528171-1528172,1528248,1528369,1528 \
383,1528407,1528424,1528855,1529149,1529181,1529317,1529546,1529549,1529787,1530057,15 \
30081,1530103,1530213,1530269,1530296,1530298,1530325,1530342,1530348,1530353,1530397, \
1530418,1530421,1530423,1530426,1530445,1530574,1530599,1530632,1530791,1530822,153086 \
6,1530875,1530909,1530989,1531087,1531099,1531130,1531138,1531156,1531161,1531271,1531312,1531600,1531659,1532036,1532269,1532286,1532373,1
532437,1532445,1532498-1532501,1532506,1532544,1532622,1532627,1532718-1532722,15327 \
65-1532766,1533048-1533049,1533117,1533312,1533347,1533962,1533980,1534165,1534418,153 \
4540,1534543-1534544,1534612,1534616,1534619,1534727,1534744,1534846,1536298,1536337,1 \
536520,1536624,1536632,1536735,1536834,1536848,1536850,1536852,1537041,1537057,1537073 \
,1537404,1537835,1538533,1538781,1538798,1538833,1538921,1538923-1538924,1539133,15391 \
57,1539173,1539180,1539445,1539452,1539623,1539688-1539689,1539702,1539716,1539887,153 \
9953,1540374,1540383-1540386,1540396-1540398,1540400-1540413,1540539,1540641,1540647,1 \
540670,1540687,1540765,1540807,1542267,1542339,1542769,1542841,1542845,1542856,1543383 \
,1543753,1543772,1543815-1543817,1543897,1543943,1543948,1544072,1544075,1544082,15441 \
65,1544208,1544210,1544453,1544455,1544460,1544472,1544589,1544593,1544606,1544679,154 \
5075,1545078,1545082,1545213,1545215,1545261,1545284,1545288,1545377,1545416,1545471,1545480,1545558,1545619,1545665,1545750,1545799,154581
4,1545832,1545847,1545863,1546172,1546372,1546382,1546631,1546656,1547032,1547760,15 \
48169,1548182-1548183,1548185,1548498,1548695,1548961,1548966,1549522,1549525,1549528, \
1549909,1550387,1550541,1550743,1550920,1551298,1551300,1551323,1551481-1551482,155195 \
3,1552042,1552071,1552080,1552287,1552804,1553126,1553608,1553650,1555163,1556725,1556 \
783,1556788,1556807,1556823,1556836,1556957,1557082,1557747,1557752,1558129,1558355,15 \
58811,1559081,1559113,1559134,1559397,1559419,1559549-1559550,1559561-1559562,1559573, \
1559662,1559697,1559707,1559798,1560017,1560158,1560177,1560212-1560213,1560784,156081 \
0,1560817,1560838,1560850,1560856,1560922,1560948,1561025,1561054-1561065,1561067-1561 \
070,1561072-1561075,1561083,1561085,1561093-1561094,1561098,1561101,1561104,1561106,15 \
61114-1561116,1561121-1561123,1561126-1561128,1561131-1561133,1561135-1561136,1561138, \
1561140,1561143-1561146,1561148-1561157,1561160-1561162,1561164-1561176,1561178-1561182,1561185-1561188,1561190-1561192,1561195,1561623,156
1635,1561640,1561732,1562411,1562458,1562581,1562597,1562742,1562746,1563206,1563989 \
,1564299,1564309,1564312,1564398,1564414,1564461,1564742-1564746,1565300-1565416,15654 \
51,1565788,1566693,1566699,1567144,1567382,1567404,1567429,1567580,1567634,1567993,156 \
8768,1568779-1568780,1568803,1568828,1568921,1568926,1568936,1569398,1569459,1569735,1 \
569755,1570114,1570120,1570176,1570547,1570601,1570629,1570713,1571196,1571725,1572574 \
,1574004,1574479,1574495,1574502,1574923,1574936,1574943,1575012,1575262,1575545,15758 \
85,1575910,1576104,1576271,1576288,1576628,1576722,1576768,1576810,1576908,1576923,157 \
7182,1577195,1577315,1577324,1577463,1577544,1577557,1577565,1577581,1577714,1577873,1 \
577944,1578309,1578329,1578337,1578610-1578611,1578636,1578810,1578812-1578813,1578817 \
,1579174,1579214-1579215,1579626,1580030,1580080,1580194,1580514,1580598,1580658,15808 \
21,1580849,1580869,1581061,1581529,1582009,1582064,1582453,1584915,1584922,1586644,1586658,1586890,1586894,1586951,1586959,1586961,1587272,
1587378-1587379,1587723,1587859,1587865,1587870,1587886,1588102,1588193,1588197,1588 \
269,1588462,1589035,1589039,1589043,1589100,1589102,1589165-1589166,1589170,1589523,15 \
89630,1589633,1589668,1589698,1589726,1589737-1589738,1589763,1589837,1589842,1589967, \
1589980,1590018,1590060,1590076,1590120,1590128,1590283,1590300,1590302,1590322,159032 \
9,1590339,1590345,1590377,1590402,1590422,1590438,1590451,1590461,1590471,1590474,1590 \
479,1590604,1590635,1590638,1590646,1590648,1590801,1590835,1590842,1590911,1593132,15 \
93189,1593200,1593259,1593261,1593284,1593335,1593356,1593387,1593421,1593506,1593621, \
1593697,1593773,1593800,1593834,1593877,1593940,1593994,1594229,1594393,1594436,159473 \
0,1594924,1595171,1595230,1595285,1595289,1595331,1595365,1595690,1595887,1595898,1596 \
081,1596141,1596189,1596275,1596390,1596971,1597532,1597541,1597572-1597573,1597652,15 \
97753-1597755,1597759,1597855,1598153,1598242,1598248,1598266-1598267,1598304,1598307,1598310-1598311,1598313,1599393,1599395,1599460,15994
79,1599500,1599558,1599738-1599739,1600109,1600162,1600408,1600449,1600495,1600501,1 \
600579-1600580,1600743,1600833,1600839,1600862,1600899,1600955,1600963,1600965,1600978 \
,1600984,1601329-1601330,1601332,1601785,1601796,1601850,1601855,1601886,1601977,16020 \
46,1602189,1602198,1602452,1602521,1602583,1602694,1602831,1602842,1602844,1602851,160 \
2858,1602865,1602956,1603591,1603621,1603770,1603775,1603779,1603783,1603947,1604024,1 \
604165,1604484-1604496,1604605,1604661,1604768,1604776,1604781,1604788,1604810,1604818 \
,1604822,1605054,1605061,1605066,1605402,1605417,1605454,1605528,1605821,1605823,16058 \
90-1605891,1606072,1606103,1606114,1606653,1607592,1607675,1607740,1607930-1607931,160 \
7934,1608301,1608428,1608443,1608481,1608645,1608963,1609061,1609175,1609334,1609593,1 \
609920,1611506,1614163,1614169,1614179,1614197,1615710,1615724,1615876,1615911,1615920 \
,1615942,1615947,1616441,1616452,1616458,1617362,1617365,1617383,1617445,1617456,1617461,1617469-1617470,1618112,1618169,1618565,1618688,16
18704,1618830,1618832-1618835,1619056,1619106,1619114,1619361-1619362,1619583,161958 \
5,1619738,1619742,1620743,1620915,1620917,1621698,1621725-1621727,1621729,1621731,1621 \
929,1621975,1622163,1622187,1622228,1622233,1622251,1622259,1622263,1622297,1622312,16 \
22342,1622470,1622713,1623236,1623384,1623392,1623685,1623693,1623695,1623779,1624110, \
1624112,1624115-1624116,1624119,1624122,1624124,1624126,1624129-1624130,1624132-162413 \
3,1624135,1624139,1624142-1624143,1624147,1624150,1624152,1624155-1624157,1624162-1624 \
165,1624220,1624233,1624235,1624246-1624247,1624252,1624254,1624396,1624408,1624422,16 \
24476,1624486-1624487,1624497-1624498,1624542,1624563-1624565,1624568-1624569,1624571, \
1624573,1624580,1624583,1624586,1624588,1624592,1624598,1624605,1624614,1624636,162464 \
2,1624645,1624647-1624648,1624655,1624657,1624679,1624959,1624984,1625501,1625504,1625 \
563,1625599,1625842,1625854,1626579,1626741,1626747-1626748,1626764-1626765,1626779,1626893,1626905,1626991,1627033,1627296,1627323,1627370
,1627525,1627531,1627569,1627629,1628517,1628524,1628541,1628978,1628984,1629293,162 \
9906,1630065,1630088,1630092,1630094,1630110,1630194,1630199,1630203,1630208-1630210,1 \
630216,1630375,1630407,1631155,1631347,1631381,1631520,1631568,1631628,1631717,1631730 \
,1631817-1631818,1631839,1631852,1631987,1631992-1631993,1632251,1632290,1632307,16324 \
11,1632423-1632425,1632512,1632523,1632584,1632600-1632601,1632604,1632965,1632975,163 \
2988,1633128,1633342,1633346,1633369,1633447-1633448,1633500,1633688,1633785,1633824-1 \
633825,1633936,1633974,1634117,1634130,1634229,1634250,1634257-1634258,1634260,1634312 \
,1634326-1634327,1634329,1634690,1635215,1635301,1635308,1635310,1636524,1637331,16376 \
84,1637695,1637890,1637892,1638720-1638725,1639653,1640083,1640088,1640275,1640322,164 \
0347,1640361,1640365,1640652,1640655-1640658,1640688,1640700-1640883,1641000,1641058,1 \
641064,1641374,1641634,1641656-1641692,1641707-1641718,1641721-1641722,1641735,1641981,1642327,1642554,1642564,1642595,1642606,1642668,1642
679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643121,1643128,1643206, \
1643209-1643210,1643216,1643270,1643283,1643309-1643310,1643536,1643570,1643634,164365 \
4,1643675,1643733,1643761,1643963,1644017,1644321,1644529,1644535,1644989,1645011,1645 \
357-1645358,1645455,1645486,1645488,1645626,1645641,1645685,1645743,1645763,1646098-16 \
669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631-167063 \
2,1670719,1670724,1670726,1670730,1670940,1672272,1672284,1673754,1674294,1675461,1675 \
486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676552,16 \
76634,1678174,1678339,1678426-1678427,1678694,1679534,1679708,1679710,1679716,1680246, \
1681123,1681450,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-168183 \
8,1681854,1681862,1681958,1682028,1682033,1682311,1682324,1682330,1684172,1684366,1684 \
383,1685739,1685744,1685772,1685826,1685891,1687242,1687261,1687268,1687340,1687544,16 \
87549,1688563,1688901,1689346,1689357,1689656,1689825,1689918,1690011,1690021,1690054, \
1690080,1690209,1691134,1691487,1692849,1693088,1693105,1694058,1694111,1694290,169450 \
1,1694548,1694788,1694872,1694878,1695354,1695371,1695706,1695778,1696199,1696280,1696 \
378,1696467,1700607,1700870,1700896,1700977,1701093,1701123,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702246,1702250,170231
3,1702630-1702631,1702633-1702634,1702637-1702638,1702640,1702647,1702662,1702665,17 \
02668,1702672,1702675-1702676,1702680,1702722,1708687,1708745,1708957,1709120,1709295, \
1709375,1709663,1709895,1709960,1710070,1710346,1710441,1710489,1710517,1710523,171057 \
1,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710930,1710933,1710945,1711 \
006,1712225,1712228,1712233,1712254,1712575,1712583,1712588,1712617,1712645,1712654,17 \
12775,1712859,1712898,1712902,1712905,1712912,1712974,1713129,1713184,1713285,1713362, \
1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,171400 \
2,1714012,1714019,1714054,1714521,1714537,1715168,1715188,1715206,1715510-1715512,1715 \
514-1715515,1715517-1715519,1715521,1715661,1715682,1715965,1716213-1716214,1716347,17 \
16354,1716413,1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882, \
1716886,1716894,1717085,1717252,1717264,1717282,1717286,1717290,1717385,1717418,1717515,1717528,1717965,1717967-1717968,1717979,1718022,171
8308,1718523,1718794,1718796,1718834,1718836-1718838,1719276,1719278,1719291,1719315 \
,1719332,1719334,1719340,1719346,1719446,1719488,1720234,1720394,1720439,1720445,17204 \
48,1720462,1720506,1720652,1720654-1720655,1720752,1720769-1720776,1720804,1720815,172 \
1303,1721307,1721311-1721314,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1 \
721866,1721881,1722205,1722292,1722399,1722522,1722526,1722532,1722548,1722574,1722583 \
,1722585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,17229 \
23,1722939,1722996,1723068,1723127,1723155,1723250,1723437,1723484,1723486,1723707,172 \
3736,1724427,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1 \
725150,1725165,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278 \
,1725282,1725405,1725599,1725601,1725635,1725646,1725649-1725652,1725694,1725696-17256 \
97,1725851,1725906-1725907,1725910,1725914,1725926,1726177,1726202,1726628,1726676,1726926,1726972-1726973,1726991,1727162,1727670,1727675,
1727899,1727914,1728091,1728433,1728448,1729185,1729361,1731008,1731856,1731882,1731 \
946,1731953,1731958,1731976,1731982-1731983,1732359,1732488,1732900,1733041,1733044,17 \
33077,1733080,1733093,1733154,1733602,1733617,1733734,1733751,1733763,1733914,1733940, \
1733963,1734113,1734128,1734192,1734258,1734420,1735577,1736162,1736209,1736280,173664 \
6,1736836,1737119,1737632,1737664,1737715,1737834,1737959,1738014-1738015,1738018,1738 \
022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738982,1739079-17 \
39081,1739087,1739153,1739172,1739176,1739474,1739775,1739814,1739817-1739818,1739975, \
1740131,1740324,1740509,1740520,1740535,1740707,1740803,1740810,1740980,1740991,174101 \
5,1741164,1741173,1741181,1741190,1741202,1741208,1741213,1741225,1741232,1741409,1742 \
090,1742276,1742919,1742975,1743115,1743117,1743124-1743125,1743554,1743679,1743696,17 \
43700-1743701,1744058,1744125,1744229,1744270,1744323,1744684,1744697,1744705,1745227,1745337,1746620,1746649,1746724,1746939,1748547,17486
29,1748715,1749287,1749665-1749666,1750015,1750056,1750975,1750995,1751061,1751097,1 \
752737,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528 \
,1754532-1754533,1754714,1754944,1754950-1754951,1755675,1755693,1755717,1755884,17558 \
90,1755918,1755942,1756013,1756039,1756408,1756410,1756939,1757123-1757124,1757126,175 \
7128,1757132-1757133,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1 \
757354,1757406,1757499,1757527,1757997,1758292,1758486-1758487,1758499,1758584,1758588 \
,1758842,1759274,1760300,1760648,1761628,1761682,1761740,1762123,1762172,1762296,17623 \
48,1762353,1762374,1762710,1762769,1763232,1763412,1763477,1763512,1763574,1763578,176 \
5299,1765358,1765439,1766822,1766834,1766840,1767328,1767368,1767429,1767471,1767505,1 \
767641-1767644,1769263,1770140,1770180,1770258,1770656,1770666,1770718,1770762,1771087 \
,1771139,1771386,1771611,1771613,1771730,1771752,1771963,1772174,1772223,1772229,1772554,1772849,1772947,1773418,1773813,1774052,1774131,17
74248,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774412,1775596,177654 \
0,1776937,1777011,1777173,1777211,1777524,1777546,1777605,1777647,1778061,1778138-1778 \
139,1778141-1778150,1778154,1779654,1779899,1780109,1780120,1780189,1780196,1780488,17 \
80514-1780516,1780601,1781569,1781986,1782814,1782857,1782868,1782946,1783144,1783155, \
1784182,1784657,1784669,1784712,1784751,1784963,1785667,1785762,1785774,1786123-178612 \
4,1786127,1786129,1786341,1786844,1788241-1788242,1788248,1788323,1788328,1788741,1788 \
747,1788764,1789051,1789400,1789415,1789442,1790376,1791527,1791557,1792460,1792468,17 \
93468,1793487,1793498,1793502,1793514,1793736,1793771,1793819,1793980,1794674,1795278, \
1795298,1795813,1795893,1796693,1796806,1796836,1796878,1797338,1797354-1797355,179751 \
6,1797678,1797692,1797694,1797748,1797828,1798280,1798371,1798379,1798384,1798390,1798 \
395,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799285,1799368,1799893,1799895,1799916
,1800136-1800138,1800309,1800454,1800464,1800473,1800791,1800816,1800981,1800984,180 \
0988,1801530,1801540,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802639,1802780-1802781,1802786,1802796,1802820,1802828,1802833,1802836,1803055,1803165
+/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,173816 \
5,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740 \
981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,17 \
43118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232, \
1744377,1744687,1744698,1744706,1745228,1746940,1748548,1748716,1749288,1749375,174966 \
8-1749669,1750016,1750057,1750976,1751000,1751062,1751098,1754112,1754144,1754282,1754 \
312,1754614,1754726,1754806,1754878,1754889,1754894,1754900,1754945,1754954,1754958,17 \
55891,1755944,1756040,1756412,1756940,1757134,1757176,1757203,1757272,1757282,1757348, \
1757355,1757423,1757501,1757535,1758488,1758493,1758500,1758589,1759275,1761629,176174 \
1,1762124,1762297,1762354-1762355,1762358,1762375,1762770,1763233,1763413,1763513,1763 \
578,1765591,1765596,1767357,1767370,1770658,1770667,1770719,1770763,1771387,1771964,1772175,1772230,1772630,1772850,1772948,1773419,1773816
-1773817,1774137,1774250,1774306-1774307,1774309,1774342,1774413,1777014,1777174,1777 \
547,1778065,1779655,1779900,1780110,1780263,1780265,1781600,1781987,1782037,1782240,17 \
82386-1782387,1782815,1782860,1782870,1782948,1783157,1784658,1784670,1784713,1784752, \
1785669,1785763,1785775,1786033,1786039,1786072,1786131,1786343,1786845,1788249,178832 \
4,1788329,1788905,1789216,1789335,1789482,1790377,1791528,1791558,1792461,1792469,1793 \
469,1793488,1793499,1793503,1793518,1793822,1795299,1795894,1796698,1796810,1796837,17 \
96879,1797339,1797357-1797358,1797521,1797697-1797699,1797750,1797829,1798372,1798380, \
1798385,1798543,1799116,1799127,1799162,1799165,1799192,1799195,1799286,1799369,179990 \
0-1799901,1799908,1799932,1800143,1800310,1800455,1800469,1800474,1800792,1800818,1800 \
982,1800985,1800989,1801531,1801541,1801693,1801775,1801779,1802084,1802782,1802789,1802805,1802821,1802829,1802834,1802837,1803168,1803447
+/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,116034 \
9-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175 \
932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,11 \
87755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840, \
1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-120334 \
5,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212 \
125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-12 \
22795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534, \
1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,123162 \
7-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237 \
995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-124 \
1822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1 \
292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108 \
,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-13026 \
10,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,130 \
4011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1 \
304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511 \
-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,13119 \
95,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,133 \
5692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1 \
337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629, \
1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,134462 \
9,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345 \
290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,13 \
45704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107, \
1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,134679 \
4,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348 \
357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,13 \
48968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879, \
1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,135086 \
4,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,13535 \
01,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,135 \
4685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1 \
356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102 \
,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1360946,13612 \
13,1361263,1361430,1361754-1361755,1361760,1361762,1361769,1361772,1361796,1361962,136 \
1982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1 \
366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370382,1370386 \
,1370441,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,13710 \
17,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,137 \
2131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,1373993,1374000,137401
9,1374073,1374086,1374823,1376994,1377078,1377292,1377311,1377321,1377342,1377433,13 \
77444,1377516,1377518-1377519,1377532,1377535,1377544,1377689,1377785,1377794,1377811, \
1377824,1377827,1377831,1377852-1377853,1377887,1377900,1378322,1378361,1378394,137869 \
9,1378715,1378730,1378733-1378734,1378818,1378868,1378918,1379047,1379090,1379178,1379 \
206,1379213,1379418,1379580,1379590,1379639,1379647,1379649,1379665,1379733,1379735,13 \
80066,1380073,1380075,1380376,1380381,1380635,1380637,1380722,1380793,1380838,1381411, \
1381623,1382314,1382343,1382366,1382515,1382832,1382842,1384051,1384055,1384063,138406 \
8-1384069,1385336,1387937,1388709,1388890,1390882,1392098,1392619,1392649,1392652,1393 \
071,1393115,1396615,1396723,1397086,1397464,1397466,1397472,1397482,1397484,1397839,13 \
97868,1397873,1397944,1397950,1397953,1397957,1397960,1397962,1397964,1397969,1397971- \
1397974,1397976-1397980,1397985,1397988-1397989,1398089,1398107,1398109-1398110,1398112,1399022,1399563,1401472,1401792,1401808,1401814,140
2113,1402122,1402345,1402348,1402350,1402428,1402573,1402576,1402600-1402601,1402622 \
,1402643,1402683,1402705,1402837,1402855,1403099,1403468,1404374,1404658,1404704,14047 \
73,1404917-1404918,1405133,1405168,1405321,1405353,1405357,1405364,1405397,1405399-140 \
5400,1405415,1405435,1405676,1405681,1406140,1406394,1406456,1406481,1406526,1406788,1 \
407595,1407619,1408043,1408148,1408154,1408156,1408159,1408163-1408165,1408248,1408438 \
,1408504,1408513-1408517,1408562-1408565,1408714,1408721,1408739,1408750,1408774,14087 \
92,1408872-1408876,1408906,1408934,1409007,1409030,1410466,1410545,1410609,1410611,141 \
0632,1410714,1410732,1410740,1410742,1410763-1410764,1410766,1411585,1411993,1412575,1 \
413552,1413556,1413562,1414053,1414113,1414215,1414889,1415177-1415179,1415186,1416458 \
,1416481,1416501,1416529,1416534-1416535,1416658,1417194,1417201,1417224,1417282,14173 \
47-1417348,1417353,1417363,1417365,1417370-1417372,1417463,1417465,1417467,1417469,1417476,1424894,1425502,1425514,1425564,1425628,1426662,
1427013,1427757,1427784,1427804,1427846,1428010,1428079,1428283,1428355,1428403,1428 \
643,1428869,1428959,1428993,1429123,1429153,1429167,1429173,1429179-1429180,1429182,14 \
29356,1429687,1429745,1429784,1429836,1429863,1429946,1429969,1430079,1430147,1430165, \
1430445,1430448,1430481,1430487,1430508,1430550,1430567,1430771,1430773,1430775,143079 \
1,1430799,1430806,1430809,1430921,1431164,1431171,1431206,1431221,1431293,1431298,1431 \
302,1431308,1431310,1431320,1431398,1431661,1431920,1431990,1432516-1432517,1432842,14 \
32845,1432867,1433976,1434403,1434428,1434438,1434447,1434456,1434463,1434500,1434598, \
1434660,1434685,1434719,1434723,1434725,1434749,1434757,1434882,1435126,1435505,143550 \
9,1435600,1435606,1435636,1435642,1435759-1435760,1435765,1435767,1437317,1437337,1437 \
505,1437637,1437649,1437743,1437891,1437897,1437903,1438411,1438463,1439054,1439334,14 \
39434,1439442,1439445,1439667,1440095,1440622,1440911,1441342,1441348,1441403,1441416,1441428,1441807,1441895,1441916,1441920,1443350,14434
05,1443427,1445111,1445125,1445190,1445208,1445212,1445328,1445337,1445520,1446108,1 \
446137,1446357,1446612,1446640,1446650,1447012,1447178,1447791,1447817-1447818,1448117 \
,1448121,1448125,1448679,1448826,1449225,1449406,1450990,1451053,1451061,1451105,14514 \
08,1451434,1451769,1451938-1451939,1451947,1451955-1451956,1452295,1452501,1452707,145 \
2719,1452721,1452752,1453105,1453112,1453435,1453439,1453490,1453544,1453549,1453621,1 \
454828,1454832,1454953,1455344,1455854,1455973,1456083,1456440,1456453,1456491,1456494 \
,1456657,1456666,1456678,1456706,1456713,1456716,1456721,1456740,1456762,1456766,14568 \
22,1456844,1456863,1456872,1456882,1456885,1456895,1456899,1456904,1456916,1456920,145 \
6926,1456932,1456959,1456963,1456970,1457299,1457301,1457362,1457382,1457402,1457452,1 \
457748,1457968,1458187,1458192,1458200,1458221,1458562,1458564-1458565,1458694,1458726 \
,1458738-1458739,1459010,1459028,1459031,1459061,1459074-1459075,1459085,1459218,1459223,1459289,1459389,1459523-1459524,1459673,1459681,14
59761,1459769,1459933,1460107,1460115,1460234,1460313,1460330,1460342,1460533,146063 \
3,1460679,1460873,1461026,1461110,1461341,1461349,1461849,1464781,1465795,1465807,1466 \
051,1466072,1466106,1467091,1468415,1470400,1470435,1470765,1471371,1471632,1475750,14 \
75791,1475900,1475930,1475968,1476761,1476805,1476815,1476972,1477051,1478857,1479175, \
1479179,1479248,1479482,1479951,1481164,1481835,1482115,1482288,1482309,1482311,148231 \
3,1482321,1482591,1482720,1482723,1482799,1482835,1482854,1483104,1483229,1483288,1483 \
360-1483361,1483390,1483552,1483554,1483679,1483743-1483744,1483786-1483787,1483816-14 \
83817,1483949,1484253,1484592,1484780,1484786,1484861-1484862,1484959,1485114,1485489, \
1485495,1485611,1485847,1485862,1486062,1486134,1486217,1486294,1486443,1486834,148686 \
1,1486875,1486890,1486939,1487862,1487882,1488151,1488793,1489170,1489195-1489196,1489 \
201,1489385,1489390,1489405,1489437,1489536,1489546,1489610,1489633,1489648,1489738,1489812,1489886,1491485,1491596,1491709,1491841,1491890
,1491940,1491942,1492307,1492336,1492343,1492358,1492555,1492570,1493011,1493013-149 \
3014,1493071,1493113,1493584,1493615,1493729,1493740,1493801,1493910,1494044,1494048,1 \
494051,1494056,1494143,1495015,1495043,1495154,1495197,1495880,1495886,1496061,1496732 \
,1496734,1497474,1497538,1497754,1498340,1498363,1498368,1498409,1498475,1498482,14984 \
98,1498669,1498698,1498808,1499371,1499388,1499513,1499953,1500003,1500062,1500371,150 \
0380,1500577,1500590,1500663,1501176,1501266,1501304,1501719,1501738,1501823,1501910,1 \
501927,1501929,1502254,1502349,1503851,1505843,1505929,1506053,1507013,1507052,1507096 \
,1507870,1507872,1508196,1508259,1508346,1509128,1509151,1509156,1509161,1509806,15102 \
46,1510271,1510488,1511212,1511217,1511434,1512034,1513025,1513148-1513149,1513665,151 \
4281,1514291,1514305,1514368,1514470,1514485-1514486,1515841,1515926,1516113,1516295,1 \
516419,1516710,1516953,1517536,1517898,1517941,1517970,1517980,1518189,1518210,1518328,1518381,1518536,1518540,1518578,1518581,1518589,1519
611,1519623,1519627,1520273,1520349,1520632,1520655,1521023,1521025,1521027,1521030, \
1521032,1521034,1521040,1521043,1521049-1521050,1521059-1521061,1521073,1521075,152127 \
1,1521276,1521444,1521687,1521829,1521831,1521834-1521835,1521837,1521839-1521840,1522 \
016,1523555,1523646-1523647,1523674,1523781,1523788,1523830,1523955,1523958,1523964,15 \
23982,1524078,1524558,1524652,1524657,1524668,1524683,1524687,1524707,1524719,1524727, \
1524761,1524978,1524984,1525593,1525696,1526043,1526052,1526730,1527480,1527493,152772 \
7-1527728,1527730-1527733,1528060,1528166,1528169,1528171-1528172,1528248,1528369,1528 \
383,1528407,1528424,1528855,1529149,1529181,1529317,1529546,1529549,1529787,1530057,15 \
30081,1530103,1530213,1530269,1530296,1530298,1530325,1530342,1530348,1530353,1530397, \
1530418,1530421,1530423,1530426,1530445,1530574,1530599,1530632,1530791,1530822,153086 \
6,1530875,1530909,1530989,1531087,1531099,1531130,1531138,1531156,1531161,1531271,1531312,1531600,1531659,1532036,1532269,1532286,1532373,1
532437,1532445,1532498-1532501,1532506,1532544,1532622,1532627,1532718-1532722,15327 \
65-1532766,1533048-1533049,1533117,1533312,1533347,1533962,1533980,1534165,1534418,153 \
4540,1534543-1534544,1534612,1534616,1534619,1534727,1534744,1534846,1536298,1536337,1 \
536520,1536624,1536632,1536735,1536834,1536848,1536850,1536852,1537041,1537057,1537073 \
,1537404,1537835,1538533,1538781,1538798,1538833,1538921,1538923-1538924,1539133,15391 \
57,1539173,1539180,1539445,1539452,1539623,1539688-1539689,1539702,1539716,1539887,153 \
9953,1540374,1540383-1540386,1540396-1540398,1540400-1540413,1540539,1540641,1540647,1 \
540670,1540687,1540765,1540807,1542267,1542339,1542769,1542841,1542845,1542856,1543383 \
,1543753,1543772,1543815-1543817,1543897,1543943,1543948,1544072,1544075,1544082,15441 \
65,1544208,1544210,1544453,1544455,1544460,1544472,1544589,1544593,1544606,1544679,154 \
5075,1545078,1545082,1545213,1545215,1545261,1545284,1545288,1545377,1545416,1545471,1545480,1545558,1545619,1545665,1545750,1545799,154581
4,1545832,1545847,1545863,1546172,1546372,1546382,1546631,1546656,1547032,1547760,15 \
48169,1548182-1548183,1548185,1548498,1548695,1548961,1548966,1549522,1549525,1549528, \
1549909,1550387,1550541,1550743,1550920,1551298,1551300,1551323,1551481-1551482,155195 \
3,1552042,1552071,1552080,1552287,1552804,1553126,1553608,1553650,1555163,1556725,1556 \
783,1556788,1556807,1556823,1556836,1556957,1557082,1557747,1557752,1558129,1558355,15 \
58811,1559081,1559113,1559134,1559397,1559419,1559549-1559550,1559561-1559562,1559573, \
1559662,1559697,1559707,1559798,1560017,1560158,1560177,1560212-1560213,1560784,156081 \
0,1560817,1560838,1560850,1560856,1560922,1560948,1561025,1561054-1561065,1561067-1561 \
070,1561072-1561075,1561083,1561085,1561093-1561094,1561098,1561101,1561104,1561106,15 \
61114-1561116,1561121-1561123,1561126-1561128,1561131-1561133,1561135-1561136,1561138, \
1561140,1561143-1561146,1561148-1561157,1561160-1561162,1561164-1561176,1561178-1561182,1561185-1561188,1561190-1561192,1561195,1561623,156
1635,1561640,1561732,1562411,1562458,1562581,1562597,1562742,1562746,1563206,1563989 \
,1564299,1564309,1564312,1564398,1564414,1564461,1564742-1564746,1565300-1565416,15654 \
51,1565788,1566693,1566699,1567144,1567382,1567404,1567429,1567580,1567634,1567993,156 \
8768,1568779-1568780,1568803,1568828,1568921,1568926,1568936,1569398,1569459,1569735,1 \
569755,1570114,1570120,1570176,1570547,1570601,1570629,1570713,1571196,1571725,1572574 \
,1574004,1574479,1574495,1574502,1574923,1574936,1574943,1575012,1575262,1575545,15758 \
85,1575910,1576104,1576271,1576288,1576628,1576722,1576768,1576810,1576908,1576923,157 \
7182,1577195,1577315,1577324,1577463,1577544,1577557,1577565,1577581,1577714,1577873,1 \
577944,1578309,1578329,1578337,1578610-1578611,1578636,1578810,1578812-1578813,1578817 \
,1579174,1579214-1579215,1579626,1580030,1580080,1580194,1580514,1580598,1580658,15808 \
21,1580849,1580869,1581061,1581529,1582009,1582064,1582453,1584915,1584922,1586644,1586658,1586890,1586894,1586951,1586959,1586961,1587272,
1587378-1587379,1587723,1587859,1587865,1587870,1587886,1588102,1588193,1588197,1588 \
269,1588462,1589035,1589039,1589043,1589100,1589102,1589165-1589166,1589170,1589523,15 \
89630,1589633,1589668,1589698,1589726,1589737-1589738,1589763,1589837,1589842,1589967, \
1589980,1590018,1590060,1590076,1590120,1590128,1590283,1590300,1590302,1590322,159032 \
9,1590339,1590345,1590377,1590402,1590422,1590438,1590451,1590461,1590471,1590474,1590 \
479,1590604,1590635,1590638,1590646,1590648,1590801,1590835,1590842,1590911,1593132,15 \
93189,1593200,1593259,1593261,1593284,1593335,1593356,1593387,1593421,1593506,1593621, \
1593697,1593773,1593800,1593834,1593877,1593940,1593994,1594229,1594393,1594436,159473 \
0,1594924,1595171,1595230,1595285,1595289,1595331,1595365,1595690,1595887,1595898,1596 \
081,1596141,1596189,1596275,1596390,1596971,1597532,1597541,1597572-1597573,1597652,15 \
97753-1597755,1597759,1597855,1598153,1598242,1598248,1598266-1598267,1598304,1598307,1598310-1598311,1598313,1599393,1599395,1599460,15994
79,1599500,1599558,1599738-1599739,1600109,1600162,1600408,1600449,1600495,1600501,1 \
600579-1600580,1600743,1600833,1600839,1600862,1600899,1600955,1600963,1600965,1600978 \
,1600984,1601329-1601330,1601332,1601785,1601796,1601850,1601855,1601886,1601977,16020 \
46,1602189,1602198,1602452,1602521,1602583,1602694,1602831,1602842,1602844,1602851,160 \
2858,1602865,1602956,1603591,1603621,1603770,1603775,1603779,1603783,1603947,1604024,1 \
604165,1604484-1604496,1604605,1604661,1604768,1604776,1604781,1604788,1604810,1604818 \
,1604822,1605054,1605061,1605066,1605402,1605417,1605454,1605528,1605821,1605823,16058 \
90-1605891,1606072,1606103,1606114,1606653,1607592,1607675,1607740,1607930-1607931,160 \
7934,1608301,1608428,1608443,1608481,1608645,1608963,1609061,1609175,1609334,1609593,1 \
609920,1611506,1614163,1614169,1614179,1614197,1615710,1615724,1615876,1615911,1615920 \
,1615942,1615947,1616441,1616452,1616458,1617362,1617365,1617383,1617445,1617456,1617461,1617469-1617470,1618112,1618169,1618565,1618688,16
18704,1618830,1618832-1618835,1619056,1619106,1619114,1619361-1619362,1619583,161958 \
5,1619738,1619742,1620743,1620915,1620917,1621698,1621725-1621727,1621729,1621731,1621 \
929,1621975,1622163,1622187,1622228,1622233,1622251,1622259,1622263,1622297,1622312,16 \
22342,1622470,1622713,1623236,1623384,1623392,1623685,1623693,1623695,1623779,1624110, \
1624112,1624115-1624116,1624119,1624122,1624124,1624126,1624129-1624130,1624132-162413 \
3,1624135,1624139,1624142-1624143,1624147,1624150,1624152,1624155-1624157,1624162-1624 \
165,1624220,1624233,1624235,1624246-1624247,1624252,1624254,1624396,1624408,1624422,16 \
24476,1624486-1624487,1624497-1624498,1624542,1624563-1624565,1624568-1624569,1624571, \
1624573,1624580,1624583,1624586,1624588,1624592,1624598,1624605,1624614,1624636,162464 \
2,1624645,1624647-1624648,1624655,1624657,1624679,1624959,1624984,1625501,1625504,1625 \
563,1625599,1625842,1625854,1626579,1626741,1626747-1626748,1626764-1626765,1626779,1626893,1626905,1626991,1627033,1627296,1627323,1627370
,1627525,1627531,1627569,1627629,1628517,1628524,1628541,1628978,1628984,1629293,162 \
9906,1630065,1630088,1630092,1630094,1630110,1630194,1630199,1630203,1630208-1630210,1 \
630216,1630375,1630407,1631155,1631347,1631381,1631520,1631568,1631628,1631717,1631730 \
,1631817-1631818,1631839,1631852,1631987,1631992-1631993,1632251,1632290,1632307,16324 \
11,1632423-1632425,1632512,1632523,1632584,1632600-1632601,1632604,1632965,1632975,163 \
679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643121,1643128,1643206,1 \
643209-1643210,1643216,1643270,1643283,1643309-1643310,1643536,1643570,1643634,1643654 \
,1643675,1643733,1643761,1643963,1644017,1644321,1644529,1644535,1644989,1645011,16453 \
57-1645358,1645455,1645486,1645488,1645626,1645641,1645685,1645743,1645763,1646098-164 \
6106,1646178,1646304,1646470-1646471,1646476,1646559,1646717-1646723,1647042,1648815,1 \
650365,1651116,1651120,1651280,1651470,1652938,1652970,1653550,1653574,1653797,1653815 \
-1653816,1653840,1654013,1654123,1654159,1654735,1654766,1654785,1656590,1659184,16617 \
70,1662696,1662736,1662985,1663264,1663277,1663534,1663562,1663676,1663995,1664174,166 \
4301,1664317,1664863-1664864,1664866,1665085,1665292,1665779,1666024,1666386-1666387,1 \
666494,1666496,1666552,1666569,1666579,1666637,1666649,1666757,1666966,1666985,1667292 \
,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668596,1668630,1669353,1669370,1669800,1
669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631-16706 \
32,1670719,1670724,1670726,1670730,1670940,1672272,1672284,1673754,1674294,1675461,167 \
5486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676552,1 \
676634,1678174,1678339,1678426-1678427,1678694,1679534,1679708,1679710,1679716,1680246 \
,1681123,1681450,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-16818 \
38,1681854,1681862,1681958,1682028,1682033,1682311,1682324,1682330,1684172,1684366,168 \
4383,1685739,1685744,1685772,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1 \
687549,1688563,1688901,1689346,1689357,1689656,1689825,1689918,1690011,1690021,1690054 \
,1690080,1690209,1691134,1691487,1692849,1693088,1693105,1694058,1694111,1694290,16945 \
01,1694548,1694788,1694872,1694878,1695354,1695371,1695706,1695778,1696199,1696280,169 \
6378,1696467,1700607,1700870,1700896,1700977,1701093,1701123,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702246,1702250,170231
3,1702630-1702631,1702633-1702634,1702637-1702638,1702640,1702647,1702662,1702665,17 \
02668,1702672,1702675-1702676,1702680,1702722,1708687,1708745,1708957,1709120,1709295, \
1709375,1709663,1709895,1709960,1710070,1710346,1710441,1710489,1710517,1710523,171057 \
1,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710930,1710933,1710945,1711 \
006,1712225,1712228,1712233,1712254,1712575,1712583,1712588,1712617,1712645,1712654,17 \
12775,1712859,1712898,1712902,1712905,1712912,1712974,1713129,1713184,1713285,1713362, \
1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,171400 \
2,1714012,1714019,1714054,1714521,1714537,1715168,1715188,1715206,1715510-1715512,1715 \
514-1715515,1715517-1715519,1715521,1715661,1715682,1715965,1716213-1716214,1716347,17 \
16354,1716413,1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882, \
1716886,1716894,1717085,1717252,1717264,1717282,1717286,1717290,1717385,1717418,1717515,1717528,1717965,1717967-1717968,1717979,1718022,171
8308,1718523,1718794,1718796,1718834,1718836-1718838,1719276,1719278,1719291,1719315 \
,1719332,1719334,1719340,1719346,1719446,1719488,1720234,1720394,1720439,1720445,17204 \
48,1720462,1720506,1720652,1720654-1720655,1720752,1720769-1720776,1720804,1720815,172 \
1303,1721307,1721311-1721314,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1 \
721866,1721881,1722205,1722292,1722399,1722522,1722526,1722532,1722548,1722574,1722583 \
,1722585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,17229 \
23,1722939,1722996,1723068,1723127,1723155,1723250,1723437,1723484,1723486,1723707,172 \
3736,1724427,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1 \
725150,1725165,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278 \
,1725282,1725405,1725599,1725601,1725635,1725646,1725649-1725652,1725694,1725696-17256 \
97,1725851,1725906-1725907,1725910,1725914,1725926,1726177,1726202,1726628,1726676,1726926,1726972-1726973,1726991,1727162,1727670,1727675,
1727899,1727914,1728091,1728433,1728448,1729185,1729361,1731008,1731856,1731882,1731 \
946,1731953,1731958,1731976,1731982-1731983,1732359,1732488,1732900,1733041,1733044,17 \
33077,1733080,1733093,1733154,1733602,1733617,1733734,1733751,1733763,1733914,1733940, \
1733963,1734113,1734128,1734192,1734258,1734420,1735577,1736162,1736209,1736280,173664 \
6,1736836,1737119,1737632,1737664,1737715,1737834,1737959,1738014-1738015,1738018,1738 \
022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738982,1739079-17 \
39081,1739087,1739153,1739172,1739176,1739474,1739775,1739814,1739817-1739818,1739975, \
1740131,1740324,1740509,1740520,1740535,1740707,1740803,1740810,1740980,1740991,174101 \
5,1741164,1741173,1741181,1741190,1741202,1741208,1741213,1741225,1741232,1741409,1742 \
090,1742276,1742919,1742975,1743115,1743117,1743124-1743125,1743554,1743679,1743696,17 \
43700-1743701,1744058,1744125,1744229,1744270,1744323,1744684,1744697,1744705,1745227,1745337,1746620,1746649,1746724,1746939,1748547,17486
29,1748715,1749287,1749665-1749666,1750015,1750056,1750975,1750995,1751061,1751097,1 \
752737,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528 \
,1754532-1754533,1754714,1754944,1754950-1754951,1755675,1755693,1755717,1755884,17558 \
90,1755918,1755942,1756013,1756039,1756408,1756410,1756939,1757123-1757124,1757126,175 \
7128,1757132-1757133,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1 \
757354,1757406,1757499,1757527,1757997,1758292,1758486-1758487,1758499,1758584,1758588 \
,1758842,1759274,1760300,1760648,1761628,1761682,1761740,1762123,1762172,1762296,17623 \
48,1762353,1762374,1762710,1762769,1763232,1763412,1763477,1763512,1763574,1763578,176 \
5299,1765358,1765439,1766822,1766834,1766840,1767328,1767368,1767429,1767471,1767505,1 \
767641-1767644,1769263,1770140,1770180,1770258,1770656,1770666,1770718,1770762,1771087 \
,1771139,1771386,1771611,1771613,1771730,1771752,1771963,1772174,1772223,1772229,1772554,1772849,1772947,1773418,1773813,1774052,1774131,17
74248,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774412,1775596,177654 \
0,1776937,1777011,1777173,1777211,1777524,1777546,1777605,1777647,1778061,1778138-1778 \
139,1778141-1778150,1778154,1779654,1779899,1780109,1780120,1780189,1780196,1780488,17 \
80514-1780516,1780601,1781569,1781986,1782814,1782857,1782868,1782946,1783144,1783155, \
1784182,1784657,1784669,1784712,1784751,1784963,1785667,1785762,1785774,1786123-178612 \
4,1786127,1786129,1786341,1786844,1788241-1788242,1788248,1788323,1788328,1788741,1788 \
747,1788764,1789051,1789400,1789415,1789442,1790376,1791527,1791557,1792460,1792468,17 \
93468,1793487,1793498,1793502,1793514,1793736,1793771,1793819,1793980,1794674,1795278, \
1795298,1795813,1795893,1796693,1796806,1796836,1796878,1797338,1797354-1797355,179751 \
6,1797678,1797692,1797694,1797748,1797828,1798280,1798371,1798379,1798384,1798390,1798 \
395,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799285,1799368,1799893,1799895,1799916
,1800136-1800138,1800309,1800454,1800464,1800473,1800791,1800816,1800981,1800984,180 \
0988,1801530,1801540,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802639,1 \
802780-1802781,1802786,1802796,1802820,1802828,1802833,1802836,1803055,1803165,1803446
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=1803449&r1=1803448&r2=1803449&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java \
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java Sun \
Jul 30 18:28:46 2017 @@ -399,9 +399,12 @@ public class WebAnnotationSet {
context.getNamingResources().addMessageDestinationRef(resource);
- } else if (type.equals("javax.resource.cci.InteractionSpec") ||
- type.equals("javax.transaction.UserTransaction") ||
- true) {
+ } else {
+ /*
+ * General case. Also used for:
+ * - javax.resource.cci.InteractionSpec
+ * - javax.transaction.UserTransaction
+ */
// resource-env-ref
ContextResourceEnvRef resource = new ContextResourceEnvRef();
---------------------------------------------------------------------
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