You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/07/02 20:15:09 UTC
svn commit: r1834881 [1/2] - in /tomcat/tc8.5.x/trunk: ./
java/org/apache/catalina/connector/ java/org/apache/catalina/core/
java/org/apache/catalina/ha/backend/ java/org/apache/catalina/ha/session/
java/org/apache/catalina/loader/ java/org/apache/cata...
Author: markt
Date: Mon Jul 2 20:15:08 2018
New Revision: 1834881
URL: http://svn.apache.org/viewvc?rev=1834881&view=rev
Log:
Backport
Use foreach loops instead of while+iterator loops
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ManifestResource.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELNode.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
tomcat/tc8.5.x/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RulesBase.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 2 20:15:08 2018
@@ -1,2 +1,2 @@
/tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763748,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,176
8283,1768520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771226,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,
1778138-1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787662,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-17885
44,1788548,1788550,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789685,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790213,1790376,1790443,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793716,1793719,1793736,1793746,1793758,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,17
94556,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799498,1799514-1799515,1799677,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800980-1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165
,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808466,1808481-1808482,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811
198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812087-1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815778,1815786,1815790,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157,1816338,1816431,1816443,1816538,1816541,1816545,1816549-1816550,1816563,1816570,1816647,1816695-1816704,1816716,1816780,1816887,1817089,1817092,1817096,1817104,1817126,1817136-1817137,1817196,1817223,1817298,1817305,1817495,1817517,1817520,1817965,1817997,1817999-1818001,1818004,1818127,1818179,1818184,1818438,1818711,1818919,1818976,1819054,1819057,1819061,1819063,1819068,1
819070-1819071,1819074,1819077,1819148,1819903,1820003,1820005,1820138,1820153,1820194,1820196-1820197,1820202,1820206,1820222,1820265,1820272,1820276,1820279,1820281,1820302,1820634,1820701,1820705,1820932,1820981,1820994,1821157,1821167,1821197-1821203,1821225,1821234-1821235,1821251-1821252,1821293,1821328,1821381,1821490,1821708,1821932,1822001,1822016,1822109,1822111,1822116,1822150,1822232,1822524,1822644,1822775,1822945-1822946,1823006-1823007,1823102,1823111,1823150,1823161,1823262,1823306,1823310,1823337,1823481,1823483,1823492,1823495,1823540,1823620,1824154,1824201,1824228,1824254,1824263,1824297,1824301,1824311,1824323,1824357,1824766,1824774,1824892,1824901,1824959,1825054,1825516,1825519,1825713,1825738,1825872,1825909,1825943,1825987,1826048,1826111,1826115,1826209,1826361,1826375,1826688,1826731,1826794,1826812,1826817,1826825,1826867,1826869,1826958,1826975,1826977,1826979,1826985-1826986,1827150,1827203-1827204,1827223,1827297,1827299,1827363,1827368,1827396,182740
8,1827428,1827479,1827491,1827498,1827860,1828016,1828223-1828239,1828253,1828262,1828545,1828551,1828565,1828946,1829082,1829084,1829086,1829276,1829355,1829364,1829366,1829830,1829879,1829915,1829924,1829934,1829990-1829991,1830013,1830051,1830068,1830087,1830325,1830336,1830341,1830367,1830373,1830378,1830549,1830669-1830670,1830764-1830765,1830772,1830802,1830861,1830864,1830989,1830999-1831001,1831251,1831256,1831262,1831333,1831338,1831341-1831342,1831389,1831410,1831439,1831483,1831486,1831556,1831568,1831573,1831691,1831718,1831726,1831763,1831828,1831985,1832124-1832125,1832127,1832129,1832160,1832163,1832193,1832262,1832518-1832519,1832525-1832526,1832545,1832554,1832572,1832592,1832596,1832602,1832619,1832665,1832692,1832696,1832704,1832707,1832744,1832843,1832856,1832882,1832925,1832965,1833001,1833016,1833062,1833071,1833737,1833757,1833768-1833770,1833794-1833800,1833825,1833831,1833906,1833915,1833918,1833982,1833989,1833994,1834001,1834003,1834011,1834020,1834058,183
4080,1834195,1834197-1834198,1834354,1834356,1834542,1834548,1834550,1834559,1834689,1834703
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763748,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,176
8283,1768520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771226,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,
1778138-1778139,1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787662,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-17885
44,1788548,1788550,1788554,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789685,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790213,1790376,1790443,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793716,1793719,1793736,1793746,1793758,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,17
94556,1794674,1794684,1794941-1794942,1795278,1795289,1795298,1795305,1795813,1795893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799498,1799514-1799515,1799677,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800980-1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135
,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808466,1808481-1808482,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811
176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812087-1812088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489,1812513,1812617,1813919,1814192,1814195,1814567,1814825,1814973,1814980,1815066,1815069,1815208,1815215,1815318-1815319,1815325,1815385,1815429,1815441-1815442,1815451,1815459,1815465,1815505,1815615,1815778,1815786,1815790,1815793,1815800,1815802,1815806,1815826,1815829,1815834,1815840,1815903,1815944,1815954,1816076,1816078,1816083,1816087,1816120,1816128,1816140,1816147,1816157,1816338,1816431,1816443,1816538,1816541,1816545,1816549-1816550,1816563,1816570,1816647,1816695-1816704,1816716,1816780,1816887,1817089,1817092,1817096,1817104,1817126,1817136-1817137,1817196,1817223,1817298,1817305,1817495,1817517,1817520,1817965,1817997,1817999-1818001,1818004,1818127,1818179,1818184,1818438,1818711,1818919,1818976,1819054,1819057,1819061,1819063,1
819068,1819070-1819071,1819074,1819077,1819148,1819903,1820003,1820005,1820138,1820153,1820194,1820196-1820197,1820202,1820206,1820222,1820265,1820272,1820276,1820279,1820281,1820302,1820634,1820701,1820705,1820932,1820981,1820994,1821157,1821167,1821197-1821203,1821225,1821234-1821235,1821251-1821252,1821293,1821328,1821381,1821490,1821708,1821932,1822001,1822016,1822109,1822111,1822116,1822150,1822232,1822524,1822644,1822775,1822945-1822946,1823006-1823007,1823102,1823111,1823150,1823161,1823262,1823306,1823310,1823337,1823481,1823483,1823492,1823495,1823540,1823620,1824154,1824201,1824228,1824254,1824263,1824297,1824301,1824311,1824323,1824357,1824766,1824774,1824892,1824901,1824959,1825054,1825516,1825519,1825713,1825738,1825872,1825909,1825943,1825987,1826048,1826111,1826115,1826209,1826361,1826375,1826688,1826731,1826794,1826812,1826817,1826825,1826867,1826869,1826958,1826975,1826977,1826979,1826985-1826986,1827150,1827203-1827204,1827223,1827297,1827299,1827363,1827368,182739
6,1827408,1827428,1827479,1827491,1827498,1827860,1828016,1828223-1828239,1828253,1828262,1828545,1828551,1828565,1828946,1829082,1829084,1829086,1829276,1829355,1829364,1829366,1829830,1829879,1829915,1829924,1829934,1829990-1829991,1830013,1830051,1830068,1830087,1830325,1830336,1830341,1830367,1830373,1830378,1830549,1830669-1830670,1830764-1830765,1830772,1830802,1830861,1830864,1830989,1830999-1831001,1831251,1831256,1831262,1831333,1831338,1831341-1831342,1831389,1831410,1831439,1831483,1831486,1831556,1831568,1831573,1831691,1831718,1831726,1831763,1831828,1831985,1832124-1832125,1832127,1832129,1832160,1832163,1832193,1832262,1832518-1832519,1832525-1832526,1832545,1832554,1832572,1832592,1832596,1832602,1832619,1832665,1832692,1832696,1832704,1832707,1832744,1832843,1832856,1832882,1832925,1832965,1833001,1833016,1833062,1833071,1833737,1833757,1833768-1833770,1833794-1833800,1833825,1833831,1833906,1833915,1833918,1833982,1833989,1833994,1834001,1834003,1834011,1834020,183
4058,1834080,1834195,1834197-1834198,1834354,1834356,1834542,1834548,1834550,1834559,1834689,1834703
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java Mon Jul 2 20:15:08 2018
@@ -33,7 +33,6 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -2953,10 +2952,7 @@ public class Request implements org.apac
@Override
public Part getPart(String name) throws IOException, IllegalStateException,
ServletException {
- Collection<Part> c = getParts();
- Iterator<Part> iterator = c.iterator();
- while (iterator.hasNext()) {
- Part part = iterator.next();
+ for (Part part : getParts()) {
if (name.equals(part.getName())) {
return part;
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java Mon Jul 2 20:15:08 2018
@@ -30,7 +30,6 @@ import java.util.Enumeration;
import java.util.EventListener;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -1376,16 +1375,13 @@ public class ApplicationContext implemen
// Create list of attributes to be removed
ArrayList<String> list = new ArrayList<>();
- Iterator<String> iter = attributes.keySet().iterator();
- while (iter.hasNext()) {
- list.add(iter.next());
+ for (String s : attributes.keySet()) {
+ list.add(s);
}
// Remove application originated attributes
// (read only attributes will be left in place)
- Iterator<String> keys = list.iterator();
- while (keys.hasNext()) {
- String key = keys.next();
+ for (String key : list) {
removeAttribute(key);
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ContainerBase.java Mon Jul 2 20:15:08 2018
@@ -23,7 +23,6 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Callable;
@@ -1266,9 +1265,7 @@ public abstract class ContainerBase exte
public ObjectName[] getChildren() {
List<ObjectName> names = new ArrayList<>(children.size());
- Iterator<Container> it = children.values().iterator();
- while (it.hasNext()) {
- Object next = it.next();
+ for (Container next : children.values()) {
if (next instanceof ContainerBase) {
names.add(((ContainerBase)next).getObjectName());
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java Mon Jul 2 20:15:08 2018
@@ -20,7 +20,6 @@ package org.apache.catalina.ha.backend;
/* for MBean to read ready and busy */
-import java.util.Iterator;
import java.util.Set;
import javax.management.MBeanServer;
@@ -58,9 +57,7 @@ public class CollectedInfo {
String onStr = "*:type=ThreadPool,*";
ObjectName objectName = new ObjectName(onStr);
Set<ObjectInstance> set = mBeanServer.queryMBeans(objectName, null);
- Iterator<ObjectInstance> iterator = set.iterator();
- while (iterator.hasNext()) {
- ObjectInstance oi = iterator.next();
+ for (ObjectInstance oi : set) {
objName = oi.getObjectName();
String name = objName.getKeyProperty("name");
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java Mon Jul 2 20:15:08 2018
@@ -17,7 +17,6 @@
package org.apache.catalina.ha.session;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.apache.catalina.DistributedManager;
@@ -257,9 +256,8 @@ public class BackupManager extends Clust
Set<String> sessionIds = new HashSet<>();
LazyReplicatedMap<String,Session> map =
(LazyReplicatedMap<String,Session>)sessions;
- Iterator<String> keys = map.keySetFull().iterator();
- while (keys.hasNext()) {
- sessionIds.add(keys.next());
+ for (String id : map.keySetFull()) {
+ sessionIds.add(id);
}
return sessionIds;
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Mon Jul 2 20:15:08 2018
@@ -1348,9 +1348,7 @@ public abstract class WebappClassLoaderB
if ((pc = loaderPC.get(codeUrl)) == null) {
pc = super.getPermissions(codeSource);
if (pc != null) {
- Iterator<Permission> perms = permissionList.iterator();
- while (perms.hasNext()) {
- Permission p = perms.next();
+ for (Permission p : permissionList) {
pc.add(p);
}
loaderPC.put(codeUrl,pc);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java Mon Jul 2 20:15:08 2018
@@ -710,9 +710,8 @@ public class StatusTransformer {
Set<ObjectName> managersON =
mBeanServer.queryNames(queryManager, null);
ObjectName managerON = null;
- Iterator<ObjectName> iterator2 = managersON.iterator();
- while (iterator2.hasNext()) {
- managerON = iterator2.next();
+ for (ObjectName aManagersON : managersON) {
+ managerON = aManagersON;
}
ObjectName queryJspMonitor = new ObjectName
@@ -755,9 +754,7 @@ public class StatusTransformer {
ObjectName servletObjectName = new ObjectName(onStr);
Set<ObjectInstance> set =
mBeanServer.queryMBeans(servletObjectName, null);
- Iterator<ObjectInstance> iterator = set.iterator();
- while (iterator.hasNext()) {
- ObjectInstance oi = iterator.next();
+ for (ObjectInstance oi : set) {
writeWrapper(writer, oi.getObjectName(), mBeanServer, mode);
}
@@ -833,9 +830,7 @@ public class StatusTransformer {
int jspCount = 0;
int jspReloadCount = 0;
- Iterator<ObjectName> iter = jspMonitorONs.iterator();
- while (iter.hasNext()) {
- ObjectName jspMonitorON = iter.next();
+ for (ObjectName jspMonitorON : jspMonitorONs) {
Object obj = mBeanServer.getAttribute(jspMonitorON, "jspCount");
jspCount += ((Integer) obj).intValue();
obj = mBeanServer.getAttribute(jspMonitorON, "jspReloadCount");
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java Mon Jul 2 20:15:08 2018
@@ -23,7 +23,6 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URLEncoder;
import java.text.MessageFormat;
-import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
@@ -332,10 +331,7 @@ public final class HTMLHostManagerServle
String hostsRemove =
smClient.getString("htmlHostManagerServlet.hostsRemove");
- Iterator<Map.Entry<String,String>> iterator =
- sortedHostNamesMap.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry<String,String> entry = iterator.next();
+ for (Map.Entry<String, String> entry : sortedHostNamesMap.entrySet()) {
String hostName = entry.getKey();
Host host = (Host) engine.findChild(hostName);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java Mon Jul 2 20:15:08 2018
@@ -17,7 +17,6 @@
package org.apache.catalina.mbeans;
import java.lang.reflect.Array;
-import java.util.Iterator;
import java.util.Set;
import javax.management.JMRuntimeException;
@@ -49,9 +48,7 @@ public class MBeanDumper {
public static String dumpBeans(MBeanServer mbeanServer, Set<ObjectName> names)
{
StringBuilder buf = new StringBuilder();
- Iterator<ObjectName> it=names.iterator();
- while( it.hasNext()) {
- ObjectName oname=it.next();
+ for (ObjectName oname : names) {
buf.append("Name: ");
buf.append(oname.toString());
buf.append(CRLF);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASRealm.java Mon Jul 2 20:15:08 2018
@@ -23,7 +23,6 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.security.Principal;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.security.auth.Subject;
@@ -528,10 +527,7 @@ public class JAASRealm extends RealmBase
Principal userPrincipal = null;
// Scan the Principals for this Subject
- Iterator<Principal> principals = subject.getPrincipals().iterator();
- while (principals.hasNext()) {
- Principal principal = principals.next();
-
+ for (Principal principal : subject.getPrincipals()) {
String principalClass = principal.getClass().getName();
if( log.isDebugEnabled() ) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/ManagerBase.java Mon Jul 2 20:15:08 2018
@@ -25,7 +25,6 @@ import java.util.Date;
import java.util.Deque;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -990,11 +989,9 @@ public abstract class ManagerBase extend
// Init
int counter = 0;
int result = 0;
- Iterator<SessionTiming> iter = copy.iterator();
// Calculate average
- while (iter.hasNext()) {
- SessionTiming timing = iter.next();
+ for (SessionTiming timing : copy) {
if (timing != null) {
int timeAlive = timing.getDuration();
counter++;
@@ -1050,11 +1047,9 @@ public abstract class ManagerBase extend
long oldest = now;
int counter = 0;
int result = 0;
- Iterator<SessionTiming> iter = sessionTiming.iterator();
// Calculate rate
- while (iter.hasNext()) {
- SessionTiming timing = iter.next();
+ for (SessionTiming timing : sessionTiming) {
if (timing != null) {
counter++;
if (timing.getTimestamp() < oldest) {
@@ -1081,9 +1076,8 @@ public abstract class ManagerBase extend
*/
public String listSessionIds() {
StringBuilder sb = new StringBuilder();
- Iterator<String> keys = sessions.keySet().iterator();
- while (keys.hasNext()) {
- sb.append(keys.next()).append(" ");
+ for (String s : sessions.keySet()) {
+ sb.append(s).append(" ");
}
return sb.toString();
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/StandardManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/StandardManager.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/StandardManager.java Mon Jul 2 20:15:08 2018
@@ -29,7 +29,6 @@ import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
-import java.util.Iterator;
import javax.servlet.ServletContext;
@@ -306,10 +305,8 @@ public class StandardManager extends Man
}
// Write the number of active sessions, followed by the details
oos.writeObject(Integer.valueOf(sessions.size()));
- Iterator<Session> elements = sessions.values().iterator();
- while (elements.hasNext()) {
- StandardSession session =
- (StandardSession) elements.next();
+ for (Session s : sessions.values()) {
+ StandardSession session = (StandardSession) s;
list.add(session);
session.passivate();
session.writeObjectData(oos);
@@ -321,9 +318,7 @@ public class StandardManager extends Man
if (log.isDebugEnabled()) {
log.debug("Expiring " + list.size() + " persisted sessions");
}
- Iterator<StandardSession> expires = list.iterator();
- while (expires.hasNext()) {
- StandardSession session = expires.next();
+ for (StandardSession session : list) {
try {
session.expire(false);
} catch (Throwable t) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java Mon Jul 2 20:15:08 2018
@@ -19,7 +19,7 @@ package org.apache.catalina.ssi;
import java.io.PrintWriter;
import java.util.Collection;
-import java.util.Iterator;
+
/**
* Implements the Server-side #printenv command
*
@@ -40,9 +40,7 @@ public class SSIPrintenv implements SSIC
writer.write(errorMessage);
} else {
Collection<String> variableNames = ssiMediator.getVariableNames();
- Iterator<String> iter = variableNames.iterator();
- while (iter.hasNext()) {
- String variableName = iter.next();
+ for (String variableName : variableNames) {
String variableValue = ssiMediator
.getVariableValue(variableName);
//This shouldn't happen, since all the variable names must
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java Mon Jul 2 20:15:08 2018
@@ -25,7 +25,6 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import org.apache.catalina.connector.Connector;
@@ -75,9 +74,7 @@ public class ConnectorStoreAppender exte
List<String> propertyKeys = getPropertyKeys(connector);
// Create blank instance
Object bean2 = new Connector(protocol);//defaultInstance(bean);
- Iterator<String> propertyIterator = propertyKeys.iterator();
- while (propertyIterator.hasNext()) {
- String key = propertyIterator.next();
+ for (String key : propertyKeys) {
Object value = IntrospectionUtils.getProperty(bean, key);
if (desc.isTransientAttribute(key)) {
continue; // Skip the specified exceptions
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Mon Jul 2 20:15:08 2018
@@ -186,17 +186,13 @@ public class GroupChannel extends Channe
@Override
public void heartbeat() {
super.heartbeat();
- Iterator<MembershipListener> membershipListenerIterator = membershipListeners.iterator();
- while ( membershipListenerIterator.hasNext() ) {
- MembershipListener listener = membershipListenerIterator.next();
+ for (MembershipListener listener : membershipListeners) {
if ( listener instanceof Heartbeat ) ((Heartbeat)listener).heartbeat();
}
- Iterator<ChannelListener> channelListenerIterator = channelListeners.iterator();
- while ( channelListenerIterator.hasNext() ) {
- ChannelListener listener = channelListenerIterator.next();
+
+ for (ChannelListener listener : channelListeners) {
if ( listener instanceof Heartbeat ) ((Heartbeat)listener).heartbeat();
}
-
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/Membership.java Mon Jul 2 20:15:08 2018
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashMap;
-import java.util.Iterator;
import org.apache.catalina.tribes.Member;
@@ -209,9 +208,7 @@ public class Membership implements Clone
}
ArrayList<Member> list = null;
- Iterator<MbrEntry> i = map.values().iterator();
- while (i.hasNext()) {
- MbrEntry entry = i.next();
+ for (MbrEntry entry : map.values()) {
if (entry.hasExpired(maxtime)) {
if (list == null) {
// Only need a list when members are expired (smaller gc)
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Mon Jul 2 20:15:08 2018
@@ -511,12 +511,9 @@ public abstract class AbstractReplicated
* @param complete boolean
*/
public void replicate(boolean complete) {
- Iterator<Map.Entry<K,MapEntry<K,V>>> i = innerMap.entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry<?,?> e = i.next();
+ for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
replicate(e.getKey(), complete);
- } //while
-
+ }
}
public void transferState() {
@@ -585,9 +582,7 @@ public abstract class AbstractReplicated
if (mapmsg.getMsgType() == MapMessage.MSG_STATE || mapmsg.getMsgType() == MapMessage.MSG_STATE_COPY) {
synchronized (stateMutex) { //make sure we dont do two things at the same time
ArrayList<MapMessage> list = new ArrayList<>();
- Iterator<Map.Entry<K,MapEntry<K,V>>> i = innerMap.entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry<?,?> e = i.next();
+ for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
if ( entry != null && entry.isSerializable() ) {
boolean copy = (mapmsg.getMsgType() == MapMessage.MSG_STATE_COPY);
@@ -808,9 +803,7 @@ public abstract class AbstractReplicated
}
if ( memberAdded ) {
synchronized (stateMutex) {
- Iterator<Map.Entry<K,MapEntry<K,V>>> i = innerMap.entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry<K,MapEntry<K,V>> e = i.next();
+ for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
if ( entry == null ) continue;
if (entry.isPrimary() && (entry.getBackupNodes() == null || entry.getBackupNodes().length == 0)) {
@@ -1135,9 +1128,9 @@ public abstract class AbstractReplicated
public void clear(boolean notify) {
if ( notify ) {
//only delete active keys
- Iterator<K> keys = keySet().iterator();
- while (keys.hasNext())
- remove(keys.next());
+ for (K k : keySet()) {
+ remove(k);
+ }
} else {
innerMap.clear();
}
@@ -1146,9 +1139,7 @@ public abstract class AbstractReplicated
@Override
public boolean containsValue(Object value) {
Objects.requireNonNull(value);
- Iterator<Map.Entry<K,MapEntry<K,V>>> i = innerMap.entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry<K,MapEntry<K,V>> e = i.next();
+ for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
if (entry!=null && entry.isActive() && value.equals(entry.getValue())) return true;
}
@@ -1176,9 +1167,7 @@ public abstract class AbstractReplicated
@Override
public Set<Map.Entry<K,V>> entrySet() {
LinkedHashSet<Map.Entry<K,V>> set = new LinkedHashSet<>(innerMap.size());
- Iterator<Map.Entry<K,MapEntry<K,V>>> i = innerMap.entrySet().iterator();
- while ( i.hasNext() ) {
- Map.Entry<?,?> e = i.next();
+ for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
Object key = e.getKey();
MapEntry<K,V> entry = innerMap.get(key);
if ( entry != null && entry.isActive() ) {
@@ -1193,9 +1182,7 @@ public abstract class AbstractReplicated
//todo implement
//should only return keys where this is active.
LinkedHashSet<K> set = new LinkedHashSet<>(innerMap.size());
- Iterator<Map.Entry<K,MapEntry<K,V>>> i = innerMap.entrySet().iterator();
- while ( i.hasNext() ) {
- Map.Entry<K,MapEntry<K,V>> e = i.next();
+ for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
K key = e.getKey();
MapEntry<K,V> entry = innerMap.get(key);
if ( entry!=null && entry.isActive() ) set.add(key);
@@ -1229,9 +1216,7 @@ public abstract class AbstractReplicated
@Override
public Collection<V> values() {
ArrayList<V> values = new ArrayList<>();
- Iterator<Map.Entry<K,MapEntry<K,V>>> i = innerMap.entrySet().iterator();
- while ( i.hasNext() ) {
- Map.Entry<K,MapEntry<K,V>> e = i.next();
+ for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
if (entry!=null && entry.isActive() && entry.getValue()!=null) values.add(entry.getValue());
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Mon Jul 2 20:15:08 2018
@@ -19,8 +19,6 @@ package org.apache.catalina.tribes.tipis
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
@@ -188,9 +186,7 @@ public class ReplicatedMap<K,V> extends
if (log.isInfoEnabled())
log.info(sm.getString("replicatedMap.member.disappeared", member));
long start = System.currentTimeMillis();
- Iterator<Map.Entry<K,MapEntry<K,V>>> i = innerMap.entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry<K,MapEntry<K,V>> e = i.next();
+ for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
if (entry==null) continue;
if (entry.isPrimary()) {
@@ -253,9 +249,7 @@ public class ReplicatedMap<K,V> extends
if ( memberAdded ) {
synchronized (stateMutex) {
Member[] backup = getMapMembers();
- Iterator<Map.Entry<K,MapEntry<K,V>>> i = innerMap.entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry<K,MapEntry<K,V>> e = i.next();
+ for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
if ( entry == null ) continue;
if (entry.isPrimary() && !inSet(member,entry.getBackupNodes())) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java Mon Jul 2 20:15:08 2018
@@ -369,10 +369,8 @@ public class NioReceiver extends Receive
Selector selector = this.selector.getAndSet(null);
if (selector == null) return;
try {
- Iterator<SelectionKey> it = selector.keys().iterator();
// look at each key in the selected set
- while (it.hasNext()) {
- SelectionKey key = it.next();
+ for (SelectionKey key : selector.keys()) {
key.channel().close();
key.attach(null);
key.cancel();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java Mon Jul 2 20:15:08 2018
@@ -21,7 +21,6 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Locale;
import java.util.StringTokenizer;
import java.util.jar.JarInputStream;
@@ -210,9 +209,7 @@ public final class ExtensionValidator {
int failureCount = 0;
ArrayList<Extension> availableExtensions = null;
- Iterator<ManifestResource> it = resources.iterator();
- while (it.hasNext()) {
- ManifestResource mre = it.next();
+ for (ManifestResource mre : resources) {
ArrayList<Extension> requiredList = mre.getRequiredExtensions();
if (requiredList == null) {
continue;
@@ -231,15 +228,11 @@ public final class ExtensionValidator {
}
// iterate through the list of required extensions
- Iterator<Extension> rit = requiredList.iterator();
- while (rit.hasNext()) {
+ for (Extension requiredExt : requiredList) {
boolean found = false;
- Extension requiredExt = rit.next();
// check the application itself for the extension
if (availableExtensions != null) {
- Iterator<Extension> ait = availableExtensions.iterator();
- while (ait.hasNext()) {
- Extension targetExt = ait.next();
+ for (Extension targetExt : availableExtensions) {
if (targetExt.isCompatibleWith(requiredExt)) {
requiredExt.setFulfilled(true);
found = true;
@@ -249,10 +242,7 @@ public final class ExtensionValidator {
}
// check the container level list for the extension
if (!found && containerAvailableExtensions != null) {
- Iterator<Extension> cit =
- containerAvailableExtensions.iterator();
- while (cit.hasNext()) {
- Extension targetExt = cit.next();
+ for (Extension targetExt : containerAvailableExtensions) {
if (targetExt.isCompatibleWith(requiredExt)) {
requiredExt.setFulfilled(true);
found = true;
@@ -303,14 +293,10 @@ public final class ExtensionValidator {
ArrayList<Extension> availableList = null;
- Iterator<ManifestResource> it = resources.iterator();
- while (it.hasNext()) {
- ManifestResource mre = it.next();
+ for (ManifestResource mre : resources) {
ArrayList<Extension> list = mre.getAvailableExtensions();
if (list != null) {
- Iterator<Extension> values = list.iterator();
- while (values.hasNext()) {
- Extension ext = values.next();
+ for (Extension ext : list) {
if (availableList == null) {
availableList = new ArrayList<>();
availableList.add(ext);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ManifestResource.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ManifestResource.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ManifestResource.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/ManifestResource.java Mon Jul 2 20:15:08 2018
@@ -17,7 +17,6 @@
package org.apache.catalina.util;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
@@ -107,9 +106,7 @@ public class ManifestResource {
if (requiredExtensions == null) {
return true;
}
- Iterator<Extension> it = requiredExtensions.iterator();
- while (it.hasNext()) {
- Extension ext = it.next();
+ for (Extension ext : requiredExtensions) {
if (!ext.isFulfilled()) return false;
}
return true;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Mon Jul 2 20:15:08 2018
@@ -27,7 +27,6 @@ import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
@@ -259,9 +258,7 @@ public class RewriteValve extends ValveB
@Override
protected synchronized void stopInternal() throws LifecycleException {
super.stopInternal();
- Iterator<RewriteMap> values = maps.values().iterator();
- while (values.hasNext()) {
- RewriteMap map = values.next();
+ for (RewriteMap map : maps.values()) {
if (map instanceof Lifecycle) {
((Lifecycle) map).stop();
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java Mon Jul 2 20:15:08 2018
@@ -22,7 +22,6 @@ import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.jar.JarEntry;
@@ -77,9 +76,7 @@ public abstract class AbstractArchiveRes
if (pathInJar.length() > 0 && pathInJar.charAt(0) == '/') {
pathInJar = pathInJar.substring(1);
}
- Iterator<String> entries = getArchiveEntries(false).keySet().iterator();
- while (entries.hasNext()) {
- String name = entries.next();
+ for (String name : getArchiveEntries(false).keySet()) {
if (name.length() > pathInJar.length() &&
name.startsWith(pathInJar)) {
if (name.charAt(name.length() - 1) == '/') {
@@ -136,9 +133,7 @@ public abstract class AbstractArchiveRes
}
}
- Iterator<String> entries = getArchiveEntries(false).keySet().iterator();
- while (entries.hasNext()) {
- String name = entries.next();
+ for (String name : getArchiveEntries(false).keySet()) {
if (name.length() > pathInJar.length() && name.startsWith(pathInJar)) {
int nextSlash = name.indexOf('/', pathInJar.length());
if (nextSlash != -1 && nextSlash != name.length() - 1) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Mon Jul 2 20:15:08 2018
@@ -1001,9 +1001,7 @@ public class Http2UpgradeHandler extends
TreeSet<Integer> candidatesStepTwo = new TreeSet<>();
TreeSet<Integer> candidatesStepThree = new TreeSet<>();
- Iterator<Entry<Integer,Stream>> entryIter = streams.entrySet().iterator();
- while (entryIter.hasNext()) {
- Entry<Integer,Stream> entry = entryIter.next();
+ for (Entry<Integer, Stream> entry : streams.entrySet()) {
Stream stream = entry.getValue();
// Never remove active streams
if (stream.isActive()) {
@@ -1024,9 +1022,7 @@ public class Http2UpgradeHandler extends
}
// Process the step one list
- Iterator<Integer> stepOneIter = candidatesStepOne.iterator();
- while (stepOneIter.hasNext()) {
- Integer streamIdToRemove = stepOneIter.next();
+ for (Integer streamIdToRemove : candidatesStepOne) {
// Remove this childless stream
Stream removedStream = streams.remove(streamIdToRemove);
removedStream.detachFromParent();
@@ -1052,9 +1048,7 @@ public class Http2UpgradeHandler extends
}
// Process the P2 list
- Iterator<Integer> stepTwoIter = candidatesStepTwo.iterator();
- while (stepTwoIter.hasNext()) {
- Integer streamIdToRemove = stepTwoIter.next();
+ for (Integer streamIdToRemove : candidatesStepTwo) {
removeStreamFromPriorityTree(streamIdToRemove);
toClose--;
if (log.isDebugEnabled()) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/JspC.java Mon Jul 2 20:15:08 2018
@@ -34,7 +34,6 @@ import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -1431,9 +1430,7 @@ public class JspC extends Task implement
initWebXml();
- Iterator<String> iter = pages.iterator();
- while (iter.hasNext()) {
- String nextjsp = iter.next();
+ for (String nextjsp : pages) {
File fjsp = new File(nextjsp);
if (!fjsp.isAbsolute()) {
fjsp = new File(uriRootF, nextjsp);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Compiler.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Compiler.java Mon Jul 2 20:15:08 2018
@@ -26,7 +26,6 @@ import java.io.UnsupportedEncodingExcept
import java.net.JarURLConnection;
import java.net.URL;
import java.net.URLConnection;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
@@ -493,9 +492,7 @@ public abstract class Compiler {
return false;
}
- Iterator<Entry<String,Long>> it = depends.entrySet().iterator();
- while (it.hasNext()) {
- Entry<String,Long> include = it.next();
+ for (Entry<String, Long> include : depends.entrySet()) {
try {
String key = include.getKey();
URL includeUrl;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELNode.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELNode.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELNode.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/ELNode.java Mon Jul 2 20:15:08 2018
@@ -207,9 +207,7 @@ abstract class ELNode {
* @throws JasperException if an error occurs while visiting a node
*/
public void visit(Visitor v) throws JasperException {
- Iterator<ELNode> iter = list.iterator();
- while (iter.hasNext()) {
- ELNode n = iter.next();
+ for (ELNode n : list) {
n.accept(v);
}
}
@@ -226,9 +224,7 @@ abstract class ELNode {
* @return true if the expression contains a ${...}
*/
public boolean containsEL() {
- Iterator<ELNode> iter = list.iterator();
- while (iter.hasNext()) {
- ELNode n = iter.next();
+ for (ELNode n : list) {
if (n instanceof Root) {
return true;
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Generator.java Mon Jul 2 20:15:08 2018
@@ -33,7 +33,6 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -571,10 +570,9 @@ class Generator {
* generation)
*/
private void genPreambleImports() {
- Iterator<String> iter = pageInfo.getImports().iterator();
- while (iter.hasNext()) {
+ for (String i : pageInfo.getImports()) {
out.printin("import ");
- out.print(iter.next());
+ out.print(i);
out.println(";");
}
@@ -601,9 +599,7 @@ class Generator {
out.printin("_jspx_dependants = new java.util.HashMap<java.lang.String,java.lang.Long>(");
out.print("" + dependants.size());
out.println(");");
- Iterator<Entry<String,Long>> iter = dependants.entrySet().iterator();
- while (iter.hasNext()) {
- Entry<String,Long> entry = iter.next();
+ for (Entry<String, Long> entry : dependants.entrySet()) {
out.printin("_jspx_dependants.put(\"");
out.print(entry.getKey());
out.print("\", Long.valueOf(");
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspConfig.java Mon Jul 2 20:15:08 2018
@@ -19,7 +19,6 @@ package org.apache.jasper.compiler;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.Vector;
import javax.servlet.ServletContext;
@@ -255,10 +254,7 @@ public class JspConfig {
JspPropertyGroup bufferMatch = null;
JspPropertyGroup errorOnUndeclaredNamespaceMatch = null;
- Iterator<JspPropertyGroup> iter = jspProperties.iterator();
- while (iter.hasNext()) {
-
- JspPropertyGroup jpg = iter.next();
+ for (JspPropertyGroup jpg : jspProperties) {
JspProperty jp = jpg.getJspProperty();
// (arrays will be the same length)
@@ -404,10 +400,7 @@ public class JspConfig {
uriExtension = uri.substring(index+1);
}
- Iterator<JspPropertyGroup> iter = jspProperties.iterator();
- while (iter.hasNext()) {
-
- JspPropertyGroup jpg = iter.next();
+ for (JspPropertyGroup jpg : jspProperties) {
String extension = jpg.getExtension();
String path = jpg.getPath();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java Mon Jul 2 20:15:08 2018
@@ -21,7 +21,6 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.security.AccessController;
import java.util.Collection;
-import java.util.Iterator;
import javax.servlet.jsp.tagext.TagFileInfo;
import javax.servlet.jsp.tagext.TagInfo;
@@ -239,14 +238,12 @@ class JspDocumentParser
*/
private void addInclude(Node parent, Collection<String> files) throws SAXException {
if (files != null) {
- Iterator<String> iter = files.iterator();
- while (iter.hasNext()) {
- String file = iter.next();
+ for (String file : files) {
AttributesImpl attrs = new AttributesImpl();
attrs.addAttribute("", "file", "file", "CDATA", file);
// Create a dummy Include directive node
- Node includeDir =
+ Node includeDir =
new Node.IncludeDirective(attrs, null, // XXX
parent);
processIncludeDirective(file, includeDir);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Mon Jul 2 20:15:08 2018
@@ -28,7 +28,6 @@ import java.security.CodeSource;
import java.security.PermissionCollection;
import java.security.Policy;
import java.security.cert.Certificate;
-import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
@@ -283,9 +282,8 @@ public final class JspRuntimeContext {
* Process a "destroy" event for this web application context.
*/
public void destroy() {
- Iterator<JspServletWrapper> servlets = jsps.values().iterator();
- while (servlets.hasNext()) {
- servlets.next().destroy();
+ for (JspServletWrapper jspServletWrapper : jsps.values()) {
+ jspServletWrapper.destroy();
}
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Node.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Node.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Node.java Mon Jul 2 20:15:08 2018
@@ -17,7 +17,6 @@
package org.apache.jasper.compiler;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
@@ -2386,9 +2385,7 @@ abstract class Node implements TagConsta
* @throws JasperException if an error occurs while visiting a node
*/
public void visit(Visitor v) throws JasperException {
- Iterator<Node> iter = list.iterator();
- while (iter.hasNext()) {
- Node n = iter.next();
+ for (Node n : list) {
n.accept(v);
}
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java Mon Jul 2 20:15:08 2018
@@ -20,7 +20,6 @@ import java.io.ByteArrayInputStream;
import java.io.CharArrayWriter;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import java.util.ListIterator;
import javax.servlet.jsp.tagext.PageData;
@@ -553,15 +552,14 @@ class PageDataImpl extends PageData impl
if (n.getImports().size() > 0) {
// Concatenate names of imported classes/packages
boolean first = true;
- ListIterator<String> iter = n.getImports().listIterator();
- while (iter.hasNext()) {
+ for (String i : n.getImports()) {
if (first) {
first = false;
buf.append(" import=\"");
} else {
buf.append(",");
}
- buf.append(JspUtil.getExprInXml(iter.next()));
+ buf.append(JspUtil.getExprInXml(i));
}
buf.append("\"\n");
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Parser.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Parser.java Mon Jul 2 20:15:08 2018
@@ -19,7 +19,6 @@ package org.apache.jasper.compiler;
import java.io.CharArrayWriter;
import java.io.FileNotFoundException;
import java.util.Collection;
-import java.util.Iterator;
import javax.servlet.jsp.tagext.TagAttributeInfo;
import javax.servlet.jsp.tagext.TagFileInfo;
@@ -387,9 +386,7 @@ class Parser implements TagConstants {
*/
private void addInclude(Node parent, Collection<String> files) throws JasperException {
if (files != null) {
- Iterator<String> iter = files.iterator();
- while (iter.hasNext()) {
- String file = iter.next();
+ for (String file : files) {
AttributesImpl attrs = new AttributesImpl();
attrs.addAttribute("", "file", "file", "CDATA", file);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/SmapUtil.java Mon Jul 2 20:15:08 2018
@@ -27,7 +27,6 @@ import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.jasper.JasperException;
@@ -124,9 +123,7 @@ public class SmapUtil {
smapInfo[1] = g.getString();
int count = 2;
- Iterator<Map.Entry<String,SmapStratum>> iter = map.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry<String,SmapStratum> entry = iter.next();
+ for (Map.Entry<String, SmapStratum> entry : map.entrySet()) {
String innerClass = entry.getKey();
s = entry.getValue();
s.optimizeLineSection();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Mon Jul 2 20:15:08 2018
@@ -19,7 +19,6 @@ package org.apache.jasper.compiler;
import java.io.IOException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map.Entry;
import java.util.Vector;
@@ -595,10 +594,8 @@ class TagFileProcessor {
try {
Object tagIns = tagClazz.getConstructor().newInstance();
if (tagIns instanceof JspSourceDependent) {
- Iterator<Entry<String,Long>> iter = ((JspSourceDependent)
- tagIns).getDependants().entrySet().iterator();
- while (iter.hasNext()) {
- Entry<String,Long> entry = iter.next();
+ for (Entry<String, Long> entry : ((JspSourceDependent)
+ tagIns).getDependants().entrySet()) {
parentPageInfo.addDependant(entry.getKey(),
entry.getValue());
}
@@ -702,9 +699,7 @@ class TagFileProcessor {
* If non-null, remove only the class file with with this name.
*/
public void removeProtoTypeFiles(String classFileName) {
- Iterator<Compiler> iter = tempVector.iterator();
- while (iter.hasNext()) {
- Compiler c = iter.next();
+ for (Compiler c : tempVector) {
if (classFileName == null) {
c.removeGeneratedClassFiles();
} else if (classFileName.equals(c.getCompilationContext()
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java?rev=1834881&r1=1834880&r2=1834881&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/JspContextWrapper.java Mon Jul 2 20:15:08 2018
@@ -454,9 +454,7 @@ public class JspContextWrapper extends P
*/
private void saveNestedVariables() {
if (nestedVars != null) {
- Iterator<String> iter = nestedVars.iterator();
- while (iter.hasNext()) {
- String varName = iter.next();
+ for (String varName : nestedVars) {
varName = findAlias(varName);
Object obj = invokingJspCtxt.getAttribute(varName);
if (obj != null) {
@@ -471,9 +469,7 @@ public class JspContextWrapper extends P
*/
private void restoreNestedVariables() {
if (nestedVars != null) {
- Iterator<String> iter = nestedVars.iterator();
- while (iter.hasNext()) {
- String varName = iter.next();
+ for (String varName : nestedVars) {
varName = findAlias(varName);
Object obj = originalNestedVars.get(varName);
if (obj != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org