Author: markt
Date: Mon Oct 16 19:47:59 2017
New Revision: 1812317
URL: http://svn.apache.org/viewvc?rev=1812317&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61601
Handle multi-release JARs for packed and unpacked web applications
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarInputStreamWrapper.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 16 19:47:59 2017
@@ -1,2 +1,2 @@
/tomcat/tc8.0.x/trunk:1809644
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409
,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,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,1768283,176
8520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,
1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,17885
54,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,17
95893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616
,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812
088,1812092,1812094,1812129,1812134-1812136,1812184
+/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,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,1768283,176
8520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,
1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,17885
54,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,17
95893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616
,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812
088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315
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=1812317&r1=1812316&r2=1812317&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 Oct 16 19:47:59 2017
@@ -32,6 +32,7 @@ import java.util.jar.Manifest;
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.util.ResourceSet;
+import org.apache.tomcat.util.compat.JreCompat;
public abstract class AbstractArchiveResourceSet extends AbstractResourceSet {
@@ -253,23 +254,28 @@ public abstract class AbstractArchiveRes
return new JarResourceRoot(root, new File(getBase()),
baseUrlString, path);
} else {
- Map<String,JarEntry> jarEntries = getArchiveEntries(true);
JarEntry jarEntry = null;
- if (!(pathInJar.charAt(pathInJar.length() - 1) == '/')) {
- if (jarEntries == null) {
- jarEntry = getArchiveEntry(pathInJar + '/');
- } else {
- jarEntry = jarEntries.get(pathInJar + '/');
- }
- if (jarEntry != null) {
- path = path + '/';
+ if (isMultiRelease()) {
+ // Calls JarFile.getJarEntry() which is multi-release aware
+ jarEntry = getArchiveEntry(pathInJar);
+ } else {
+ Map<String,JarEntry> jarEntries = getArchiveEntries(true);
+ if (!(pathInJar.charAt(pathInJar.length() - 1) == '/')) {
+ if (jarEntries == null) {
+ jarEntry = getArchiveEntry(pathInJar + '/');
+ } else {
+ jarEntry = jarEntries.get(pathInJar + '/');
+ }
+ if (jarEntry != null) {
+ path = path + '/';
+ }
}
- }
- if (jarEntry == null) {
- if (jarEntries == null) {
- jarEntry = getArchiveEntry(pathInJar);
- } else {
- jarEntry = jarEntries.get(pathInJar);
+ if (jarEntry == null) {
+ if (jarEntries == null) {
+ jarEntry = getArchiveEntry(pathInJar);
+ } else {
+ jarEntry = jarEntries.get(pathInJar);
+ }
}
}
if (jarEntry == null) {
@@ -283,6 +289,8 @@ public abstract class AbstractArchiveRes
}
}
+ protected abstract boolean isMultiRelease();
+
protected abstract WebResource createArchiveResource(JarEntry jarEntry,
String webAppPath, Manifest manifest);
@@ -305,7 +313,7 @@ public abstract class AbstractArchiveRes
protected JarFile openJarFile() throws IOException {
synchronized (archiveLock) {
if (archive == null) {
- archive = new JarFile(getBase());
+ archive =
JreCompat.getInstance().jarFileNewInstance(getBase());
}
archiveUseCount++;
return archive;
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java?rev=1812317&r1=1812316&r2=1812317&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
Mon Oct 16 19:47:59 2017
@@ -27,6 +27,7 @@ import java.util.jar.JarFile;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.WebResourceRoot;
import org.apache.tomcat.util.buf.UriUtil;
+import org.apache.tomcat.util.compat.JreCompat;
/**
* Base class for a {@link org.apache.catalina.WebResourceSet} based on a
@@ -34,6 +35,8 @@ import org.apache.tomcat.util.buf.UriUti
*/
public abstract class AbstractSingleArchiveResourceSet extends
AbstractArchiveResourceSet {
+ private volatile Boolean multiRelease;
+
/**
* A no argument constructor is required for this to work with the
digester.
*/
@@ -103,11 +106,37 @@ public abstract class AbstractSingleArch
}
+ @Override
+ protected boolean isMultiRelease() {
+ if (multiRelease == null) {
+ synchronized (archiveLock) {
+ if (multiRelease == null) {
+ JarFile jarFile = null;
+ try {
+ jarFile = openJarFile();
+ multiRelease = Boolean.valueOf(
+
JreCompat.getInstance().jarFileIsMultiRelease(jarFile));
+ } catch (IOException ioe) {
+ // Should never happen
+ throw new IllegalStateException(ioe);
+ } finally {
+ if (jarFile != null) {
+ closeJarFile();
+ }
+ }
+ }
+ }
+ }
+
+ return multiRelease.booleanValue();
+ }
+
+
//-------------------------------------------------------- Lifecycle
methods
@Override
protected void initInternal() throws LifecycleException {
- try (JarFile jarFile = new JarFile(getBase())) {
+ try (JarFile jarFile =
JreCompat.getInstance().jarFileNewInstance(getBase())) {
setManifest(jarFile.getManifest());
} catch (IOException ioe) {
throw new IllegalArgumentException(ioe);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java?rev=1812317&r1=1812316&r2=1812317&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
Mon Oct 16 19:47:59 2017
@@ -21,6 +21,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.JarInputStream;
@@ -30,6 +33,7 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
import org.apache.tomcat.util.buf.UriUtil;
+import org.apache.tomcat.util.compat.JreCompat;
/**
* Represents a {@link org.apache.catalina.WebResourceSet} based on a JAR file
@@ -100,6 +104,7 @@ public class JarWarResourceSet extends A
JarFile warFile = null;
InputStream jarFileIs = null;
archiveEntries = new HashMap<>();
+ boolean multiRelease = false;
try {
warFile = openJarFile();
JarEntry jarFileInWar = warFile.getJarEntry(archivePath);
@@ -111,7 +116,14 @@ public class JarWarResourceSet extends A
archiveEntries.put(entry.getName(), entry);
entry = jarIs.getNextJarEntry();
}
- setManifest(jarIs.getManifest());
+ Manifest m = jarIs.getManifest();
+ setManifest(m);
+ if (m != null && JreCompat.isJre9Available()) {
+ String value =
m.getMainAttributes().getValue("Multi-Release");
+ if (value != null) {
+ multiRelease = Boolean.parseBoolean(value);
+ }
+ }
// Hack to work-around JarInputStream swallowing these
// entries. TomcatJarInputStream is used above which
// extends JarInputStream and the method that creates
@@ -127,6 +139,9 @@ public class JarWarResourceSet extends A
archiveEntries.put(entry.getName(), entry);
}
}
+ if (multiRelease) {
+ processArchivesEntriesForMultiRelease();
+ }
} catch (IOException ioe) {
// Should never happen
archiveEntries = null;
@@ -149,6 +164,56 @@ public class JarWarResourceSet extends A
}
+ protected void processArchivesEntriesForMultiRelease() {
+
+ int targetVersion =
JreCompat.getInstance().jarFileRuntimeMajorVersion();
+
+ Map<String,VersionedJarEntry> versionedEntries = new HashMap<>();
+ Iterator<Entry<String,JarEntry>> iter =
archiveEntries.entrySet().iterator();
+ while (iter.hasNext()) {
+ Entry<String,JarEntry> entry = iter.next();
+ String name = entry.getKey();
+ if (name.startsWith("META-INF/versions/")) {
+ // Remove the multi-release version
+ iter.remove();
+
+ // Get the base name and version for this versioned entry
+ int i = name.indexOf('/', 18);
+ if (i > 0) {
+ String baseName = name.substring(i + 1);
+ int version = Integer.parseInt(name.substring(18, i));
+
+ // Ignore any entries targeting for a later version than
+ // the target for this runtime
+ if (version <= targetVersion) {
+ VersionedJarEntry versionedJarEntry =
versionedEntries.get(baseName);
+ if (versionedJarEntry == null) {
+ // No versioned entry found for this name. Create
+ // one.
+ versionedEntries.put(baseName,
+ new VersionedJarEntry(version,
entry.getValue()));
+ } else {
+ // Ignore any entry for which we have already found
+ // a later version
+ if (version > versionedJarEntry.getVersion()) {
+ // Replace the entry targeted at an earlier
+ // version
+ versionedEntries.put(baseName,
+ new VersionedJarEntry(version,
entry.getValue()));
+ }
+ }
+ }
+ }
+ }
+ }
+
+ for (Entry<String,VersionedJarEntry> versionedJarEntry :
versionedEntries.entrySet()) {
+ archiveEntries.put(versionedJarEntry.getKey(),
+ versionedJarEntry.getValue().getJarEntry());
+ }
+ }
+
+
/**
* {@inheritDoc}
* <p>
@@ -161,6 +226,14 @@ public class JarWarResourceSet extends A
}
+ @Override
+ protected boolean isMultiRelease() {
+ // This always returns false otherwise the superclass will call
+ // #getArchiveEntry(String)
+ return false;
+ }
+
+
//-------------------------------------------------------- Lifecycle
methods
@Override
protected void initInternal() throws LifecycleException {
@@ -182,4 +255,25 @@ public class JarWarResourceSet extends A
throw new IllegalArgumentException(e);
}
}
+
+
+ private static final class VersionedJarEntry {
+ private final int version;
+ private final JarEntry jarEntry;
+
+ public VersionedJarEntry(int version, JarEntry jarEntry) {
+ this.version = version;
+ this.jarEntry = jarEntry;
+ }
+
+
+ public int getVersion() {
+ return version;
+ }
+
+
+ public JarEntry getJarEntry() {
+ return jarEntry;
+ }
+ }
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java?rev=1812317&r1=1812316&r2=1812317&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java Mon
Oct 16 19:47:59 2017
@@ -16,7 +16,9 @@
*/
package org.apache.tomcat.util.compat;
+import java.io.File;
import java.io.IOException;
+import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
@@ -25,6 +27,8 @@ import java.net.URL;
import java.net.URLConnection;
import java.util.Deque;
import java.util.Set;
+import java.util.jar.JarFile;
+import java.util.zip.ZipFile;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
@@ -49,14 +53,13 @@ class Jre9Compat extends Jre8Compat {
private static final Method locationMethod;
private static final Method isPresentMethod;
private static final Method getMethod;
+ private static final Constructor<JarFile> jarFileConstructor;
+ private static final Method isMultiReleaseMethod;
- static {
- Class<?> moduleLayerClazz = null;
- Class<?> configurationClazz = null;
- Class<?> resolvedModuleClazz = null;
- Class<?> moduleReferenceClazz = null;
- Class<?> optionalClazz = null;
+ private static final Object RUNTIME_VERSION;
+ private static final int RUNTIME_MAJOR_VERSION;
+ static {
Class<?> c1 = null;
Method m2 = null;
Method m3 = null;
@@ -68,13 +71,20 @@ class Jre9Compat extends Jre8Compat {
Method m9 = null;
Method m10 = null;
Method m11 = null;
+ Constructor<JarFile> c12 = null;
+ Method m13 = null;
+ Object o14 = null;
+ Object o15 = null;
try {
- moduleLayerClazz = Class.forName("java.lang.ModuleLayer");
- configurationClazz =
Class.forName("java.lang.module.Configuration");
- resolvedModuleClazz =
Class.forName("java.lang.module.ResolvedModule");
- moduleReferenceClazz =
Class.forName("java.lang.module.ModuleReference");
- optionalClazz = Class.forName("java.util.Optional");
+ Class<?> moduleLayerClazz = Class.forName("java.lang.ModuleLayer");
+ Class<?> configurationClazz =
Class.forName("java.lang.module.Configuration");
+ Class<?> resolvedModuleClazz =
Class.forName("java.lang.module.ResolvedModule");
+ Class<?> moduleReferenceClazz =
Class.forName("java.lang.module.ModuleReference");
+ Class<?> optionalClazz = Class.forName("java.util.Optional");
+ Class<?> versionClazz = Class.forName("java.lang.Runtime$Version");
+ Method runtimeVersionMethod =
JarFile.class.getMethod("runtimeVersion");
+ Method majorMethod = versionClazz.getMethod("major");
c1 =
Class.forName("java.lang.reflect.InaccessibleObjectException");
m2 = SSLParameters.class.getMethod("setApplicationProtocols",
String[].class);
@@ -87,11 +97,17 @@ class Jre9Compat extends Jre8Compat {
m9 = moduleReferenceClazz.getMethod("location");
m10 = optionalClazz.getMethod("isPresent");
m11 = optionalClazz.getMethod("get");
- } catch (SecurityException | NoSuchMethodException e) {
- // Should never happen
+ c12 = JarFile.class.getConstructor(File.class, boolean.class,
int.class, versionClazz);
+ m13 = JarFile.class.getMethod("isMultiRelease");
+ o14 = runtimeVersionMethod.invoke(null);
+ o15 = majorMethod.invoke(o14);
+
} catch (ClassNotFoundException e) {
// Must be Java 8
+ } catch (ReflectiveOperationException | IllegalArgumentException e) {
+ // Should never happen
}
+
inaccessibleObjectExceptionClazz = c1;
setApplicationProtocolsMethod = m2;
getApplicationProtocolMethod = m3;
@@ -103,6 +119,16 @@ class Jre9Compat extends Jre8Compat {
locationMethod = m9;
isPresentMethod = m10;
getMethod = m11;
+ jarFileConstructor = c12;
+ isMultiReleaseMethod = m13;
+
+ RUNTIME_VERSION = o14;
+ if (o15 != null) {
+ RUNTIME_MAJOR_VERSION = ((Integer) o15).intValue();
+ } else {
+ // Must be Java 8
+ RUNTIME_MAJOR_VERSION = 8;
+ }
}
@@ -175,4 +201,31 @@ class Jre9Compat extends Jre8Compat {
throw new UnsupportedOperationException(e);
}
}
+
+
+ @Override
+ public JarFile jarFileNewInstance(File f) throws IOException {
+ try {
+ return jarFileConstructor.newInstance(
+ f, Boolean.TRUE, Integer.valueOf(ZipFile.OPEN_READ),
RUNTIME_VERSION);
+ } catch (ReflectiveOperationException | IllegalArgumentException e) {
+ throw new IOException(e);
+ }
+ }
+
+
+ @Override
+ public boolean jarFileIsMultiRelease(JarFile jarFile) {
+ try {
+ return ((Boolean)
isMultiReleaseMethod.invoke(jarFile)).booleanValue();
+ } catch (ReflectiveOperationException | IllegalArgumentException e) {
+ return false;
+ }
+ }
+
+
+ @Override
+ public int jarFileRuntimeMajorVersion() {
+ return RUNTIME_MAJOR_VERSION;
+ }
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1812317&r1=1812316&r2=1812317&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java Mon
Oct 16 19:47:59 2017
@@ -16,10 +16,12 @@
*/
package org.apache.tomcat.util.compat;
+import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
import java.util.Deque;
+import java.util.jar.JarFile;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
@@ -33,6 +35,8 @@ import org.apache.tomcat.util.res.String
*/
public class JreCompat {
+ private static final int RUNTIME_MAJOR_VERSION = 8;
+
private static final JreCompat instance;
private static StringManager sm =
StringManager.getManager(JreCompat.class.getPackage().getName());
@@ -143,7 +147,7 @@ public class JreCompat {
/**
- * Obtains the URls for all the JARs on the module path when the JVM starts
+ * Obtains the URLs for all the JARs on the module path when the JVM starts
* and adds them to the provided Deque.
*
* @param classPathUrlsToProcess The Deque to which the modules should
be
@@ -153,4 +157,53 @@ public class JreCompat {
// NO-OP for Java 7. There is no module path.
}
+
+ /**
+ * Creates a new JarFile instance. When running on Java 9 and later, the
+ * JarFile will be multi-release JAR aware. While this isn't strictly
+ * required to be in this package, it is provided as a convenience method.
+ *
+ * @param s The JAR file to open
+ *
+ * @return A JarFile instance based on the provided path
+ *
+ * @throws IOException If an I/O error occurs creating the JarFile
instance
+ */
+ public final JarFile jarFileNewInstance(String s) throws IOException {
+ return jarFileNewInstance(new File(s));
+ }
+
+
+ /**
+ * Creates a new JarFile instance. When running on Java 9 and later, the
+ * JarFile will be multi-release JAR aware.
+ *
+ * @param f The JAR file to open
+ *
+ * @return A JarFile instance based on the provided file
+ *
+ * @throws IOException If an I/O error occurs creating the JarFile
instance
+ */
+ public JarFile jarFileNewInstance(File f) throws IOException {
+ return new JarFile(f);
+ }
+
+
+ /**
+ * Is this JarFile a multi-release JAR file.
+ *
+ * @param jarFile The JarFile to test
+ *
+ * @return {@code true} If it is a multi-release JAR file and is configured
+ * to behave as such.
+ */
+ public boolean jarFileIsMultiRelease(JarFile jarFile) {
+ // Java 8 doesn't support multi-release so default to false
+ return false;
+ }
+
+
+ public int jarFileRuntimeMajorVersion() {
+ return RUNTIME_MAJOR_VERSION;
+ }
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java?rev=1812317&r1=1812316&r2=1812317&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
Mon Oct 16 19:47:59 2017
@@ -19,10 +19,14 @@ package org.apache.tomcat.util.scan;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
import java.util.jar.JarEntry;
import java.util.jar.Manifest;
import org.apache.tomcat.Jar;
+import org.apache.tomcat.util.compat.JreCompat;
/**
* Base implementation of Jar for implementations that use a JarInputStream to
@@ -34,6 +38,8 @@ public abstract class AbstractInputStrea
private NonClosingJarInputStream jarInputStream = null;
private JarEntry entry = null;
+ private Boolean multiRelease = null;
+ private Map<String,String> mrMap = null;
public AbstractInputStreamJar(URL jarFileUrl) {
this.jarFileURL = jarFileUrl;
@@ -50,7 +56,7 @@ public abstract class AbstractInputStrea
public void nextEntry() {
if (jarInputStream == null) {
try {
- jarInputStream = createJarInputStream();
+ reset();
} catch (IOException e) {
entry = null;
return;
@@ -58,6 +64,21 @@ public abstract class AbstractInputStrea
}
try {
entry = jarInputStream.getNextJarEntry();
+ if (multiRelease.booleanValue()) {
+ // Skip base entries where there is a multi-release entry
+ // Skip multi-release entries that are not being used
+ while (entry != null &&
+ (mrMap.keySet().contains(entry.getName()) ||
+
entry.getName().startsWith("META-INF/versions/") &&
+ !mrMap.values().contains(entry.getName()))) {
+ entry = jarInputStream.getNextJarEntry();
+ }
+ } else {
+ // Skip multi-release entries
+ while (entry != null &&
entry.getName().startsWith("META-INF/versions/")) {
+ entry = jarInputStream.getNextJarEntry();
+ }
+ }
} catch (IOException ioe) {
entry = null;
}
@@ -66,6 +87,8 @@ public abstract class AbstractInputStrea
@Override
public String getEntryName() {
+ // Given how the entry name is used, there is no requirement to convert
+ // the name for a multi-release entry to the corresponding base name.
if (entry == null) {
return null;
} else {
@@ -136,6 +159,25 @@ public abstract class AbstractInputStrea
closeStream();
entry = null;
jarInputStream = createJarInputStream();
+ // Only perform multi-release processing on first access
+ if (multiRelease == null) {
+ if (JreCompat.isJre9Available()) {
+ Manifest manifest = jarInputStream.getManifest();
+ String mrValue =
manifest.getMainAttributes().getValue("Multi-Release");
+ if (mrValue == null) {
+ multiRelease = Boolean.FALSE;
+ } else {
+ multiRelease = Boolean.valueOf(mrValue);
+ }
+ } else {
+ multiRelease = Boolean.FALSE;
+ }
+ if (multiRelease.booleanValue()) {
+ if (mrMap == null) {
+ populateMrMap();
+ }
+ }
+ }
}
@@ -154,10 +196,25 @@ public abstract class AbstractInputStrea
private void gotoEntry(String name) throws IOException {
+ if (multiRelease == null) {
+ reset();
+ }
+
+ // Need to convert requested name to multi-release name (if one exists)
+ if (multiRelease.booleanValue()) {
+ String mrName = mrMap.get(name);
+ if (mrName != null) {
+ name = mrName;
+ }
+ } else if (name.startsWith("META-INF/versions/")) {
+ entry = null;
+ return;
+ }
+
if (entry != null && name.equals(entry.getName())) {
return;
}
- reset();
+
JarEntry jarEntry = jarInputStream.getNextJarEntry();
while (jarEntry != null) {
if (name.equals(jarEntry.getName())) {
@@ -167,4 +224,57 @@ public abstract class AbstractInputStrea
jarEntry = jarInputStream.getNextJarEntry();
}
}
+
+
+ private void populateMrMap() throws IOException {
+ int targetVersion =
JreCompat.getInstance().jarFileRuntimeMajorVersion();
+
+ Map<String,Integer> mrVersions = new HashMap<>();
+
+ JarEntry jarEntry = jarInputStream.getNextJarEntry();
+
+ // Tracking the base name and the latest valid version found is
+ // sufficient to be able to create the renaming map required
+ while (jarEntry != null) {
+ String name = jarEntry.getName();
+ if (name.startsWith("META-INF/versions/") &&
name.endsWith(".class")) {
+
+ // Get the base name and version for this versioned entry
+ int i = name.indexOf('/', 18);
+ if (i > 0) {
+ String baseName = name.substring(i + 1);
+ int version = Integer.parseInt(name.substring(18, i));
+
+ // Ignore any entries targeting for a later version than
+ // the target for this runtime
+ if (version <= targetVersion) {
+ Integer mappedVersion = mrVersions.get(baseName);
+ if (mappedVersion == null) {
+ // No version found for this name. Create one.
+ mrVersions.put(baseName, Integer.valueOf(version));
+ } else {
+ // Ignore any entry for which we have already found
+ // a later version
+ if (version > mappedVersion.intValue()) {
+ // Replace the earlier version
+ mrVersions.put(baseName,
Integer.valueOf(version));
+ }
+ }
+ }
+ }
+ }
+ jarEntry = jarInputStream.getNextJarEntry();
+ }
+
+ mrMap = new HashMap<>();
+
+ for (Entry<String,Integer> mrVersion : mrVersions.entrySet()) {
+ mrMap.put(mrVersion.getKey() , "META-INF/versions/" +
mrVersion.getValue().toString() + ""
+ + "/" + mrVersion.getKey());
+ }
+
+ // Reset stream back to the beginning of the JAR
+ closeStream();
+ jarInputStream = createJarInputStream();
+ }
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java?rev=1812317&r1=1812316&r2=1812317&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
Mon Oct 16 19:47:59 2017
@@ -23,23 +23,28 @@ import java.net.JarURLConnection;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
import org.apache.tomcat.Jar;
+import org.apache.tomcat.util.compat.JreCompat;
/**
* Implementation of {@link Jar} that is optimised for file based JAR URLs that
* refer directly to a JAR file (e.g URLs of the form jar:file: ... .jar!/ or
- * file:... .jar) .
+ * file:... .jar).
*/
public class JarFileUrlJar implements Jar {
private final JarFile jarFile;
private final URL jarFileURL;
+ private final boolean multiRelease;
private Enumeration<JarEntry> entries;
+ private Set<String> entryNamesSeen;
private JarEntry entry = null;
public JarFileUrlJar(URL url, boolean startsWithJar) throws IOException {
@@ -57,9 +62,10 @@ public class JarFileUrlJar implements Ja
} catch (URISyntaxException e) {
throw new IOException(e);
}
- jarFile = new JarFile(f);
+ jarFile = JreCompat.getInstance().jarFileNewInstance(f);
jarFileURL = url;
}
+ multiRelease = JreCompat.getInstance().jarFileIsMultiRelease(jarFile);
}
@@ -77,6 +83,7 @@ public class JarFileUrlJar implements Ja
@Override
public InputStream getInputStream(String name) throws IOException {
+ // JarFile#getEntry() is multi-release aware
ZipEntry entry = jarFile.getEntry(name);
if (entry == null) {
return null;
@@ -87,6 +94,7 @@ public class JarFileUrlJar implements Ja
@Override
public long getLastModified(String name) throws IOException {
+ // JarFile#getEntry() is multi-release aware
ZipEntry entry = jarFile.getEntry(name);
if (entry == null) {
return -1;
@@ -118,13 +126,58 @@ public class JarFileUrlJar implements Ja
@Override
public void nextEntry() {
+ // JarFile#entries() is NOT multi-release aware
if (entries == null) {
entries = jarFile.entries();
+ if (multiRelease) {
+ entryNamesSeen = new HashSet<>();
+ }
}
- if (entries.hasMoreElements()) {
- entry = entries.nextElement();
+
+ if (multiRelease) {
+ // Need to ensure that:
+ // - the one, correct entry is returned where multiple versions
+ // are available
+ // - that the order of entries in the JAR doesn't prevent the
+ // correct entries being returned
+ // - the case where an entry appears in the versions location
+ // but not in the the base location is handled correctly
+
+ // Enumerate the entries until one is reached that represents an
+ // entry that has not been seen before.
+ String name = null;
+ while (true) {
+ if (entries.hasMoreElements()) {
+ entry = entries.nextElement();
+ name = entry.getName();
+ // Get 'base' name
+ if (name.startsWith("META-INF/versions/")) {
+ int i = name.indexOf('/', 18);
+ if (i == -1) {
+ continue;
+ }
+ name = name.substring(i + 1);
+ }
+ if (name.length() == 0 || entryNamesSeen.contains(name)) {
+ continue;
+ }
+
+ entryNamesSeen.add(name);
+
+ // JarFile.getJarEntry is version aware so use it
+ entry = jarFile.getJarEntry(entry.getName());
+ break;
+ } else {
+ entry = null;
+ break;
+ }
+ }
} else {
- entry = null;
+ if (entries.hasMoreElements()) {
+ entry = entries.nextElement();
+ } else {
+ entry = null;
+ }
}
}
@@ -155,6 +208,7 @@ public class JarFileUrlJar implements Ja
@Override
public void reset() throws IOException {
entries = null;
+ entryNamesSeen = null;
entry = null;
}
}
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarInputStreamWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarInputStreamWrapper.java?rev=1812317&r1=1812316&r2=1812317&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarInputStreamWrapper.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestJarInputStreamWrapper.java
Mon Oct 16 19:47:59 2017
@@ -27,6 +27,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.WebResource;
+import org.apache.tomcat.util.compat.JreCompat;
public class TestJarInputStreamWrapper {
@@ -118,7 +119,7 @@ public class TestJarInputStreamWrapper {
private InputStream getUnwrappedClosedInputStream() throws IOException {
File file = new File("test/webresources/non-static-resources.jar");
- JarFile jarFile = new JarFile(file);
+ JarFile jarFile = JreCompat.getInstance().jarFileNewInstance(file);
ZipEntry jarEntry = jarFile.getEntry("META-INF/MANIFEST.MF");
InputStream unwrapped = jarFile.getInputStream(jarEntry);
unwrapped.close();
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1812317&r1=1812316&r2=1812317&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Oct 16 19:47:59 2017
@@ -63,6 +63,10 @@
JARs on the module path when running on Java 9 and class path scanning
is enabled. (markt)
</fix>
+ <fix>
+ <bug>61601</bug>: Add support for multi-release JARs in JAR scanning
and
+ web application class loading. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
