Author: markt
Date: Mon Aug 22 10:27:40 2016
New Revision: 1757135
URL: http://svn.apache.org/viewvc?rev=1757135&view=rev
Log:
Updating Tomcat's copy of BCEL as far as HEAD (including 6.0 and some post 6.0
fixes that are NO-OPs for our fork)
Added:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Const.java
- copied, changed from r1757134,
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
Removed:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 10:27:40 2016
@@ -1,2 +1,2 @@
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,170
2923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,1703160,1703164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,1705842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710924,1710930,1710933,1710945,1711006,
1711016,1711022,1711026,1712163,1712225,1712228,1712233,1712250,1712254,1712489,1712547-1712548,1712588,1712617,1712645,1712654,1712695,1712765-1712766,1712771,1712775,1712859,1712876,1712898,1712902,1712905,1712912,1712974,1713129,1713168,1713184,1713285,1713362,1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715168,1715188,1715206,1715413,1715415,1715434,1715510-1715512,1715514-1715515,1715517-1715519,1715521,1715633,1715661,1715682,1715965,1716213-1716214,1716258,1716269,1716347,1716354,1716364,1716413,1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882,1716886,1716894,1717085,1717225,1717233,1717252,1717264,1717282,1717286,1717290,1717385,1717416,1717418,1717445,1717515,1717520,1717528,1717965,1717967-1717968,1717979,1718022,1718308,1718523,1718794,1718796,1718834,1718836-1718838,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,1719446,1719488,1719909-17199
10,1720200,1720234,1720394,1720439,1720445,1720448,1720462,1720506,1720652,1720654-1720655,1720711,1720752,1720769,1720776,1720804,1720815,1721303,1721307,1721311,1721314,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1721866,1721881,1721887,1722205,1722292,1722399,1722453,1722455,1722522,1722526,1722532,1722548,1722574,1722583,1722585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,1722923,1722939,1722945,1722996,1723068,1723127,1723155,1723250,1723316-1723318,1723368,1723371,1723375,1723377,1723380,1723410,1723414,1723437,1723484,1723486,1723493-1723494,1723500,1723552,1723554,1723683,1723707,1723736,1724012,1724232,1724252,1724325,1724427-1724428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1725165,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278,1725282,1725405,1725599,1725601,1725635,1725646,1725649-1725652,1725694,1725696-1725697,1725816,1725851,1725906-1725907,1725910,1725914,1725920,17
25926,1726177,1726202,1726628,1726632,1726637,1726639,1726648,1726651,1726654,1726669,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727899,1727914,1727917,1728091,1728138,1728433,1728448,1728664,1728677,1729185,1729361,1729625,1729730,1730101-1730102,1730137,1730612,1730946-1730975,1731008,1731055,1731079,1731283,1731856,1731882,1731946-1731958,1731976-1731983,1732359,1732488,1732900-1733448,1733602,1733617-1733963,1733978,1734113,1734128,1734192,1734258,1734301,1734418-1734454,1734466-1734512,1734522,1734592,1734594,1734597,1735041,1735577,1736162,1736209,1736280,1736646,1736836,1737119,1737280,1737339,1737632,1737664,1737715,1737834,1737903,1737959,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738643,1738850,1738982,1738996,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740509,1740520,1740535,1740707
,1740803,1740810,1740980,1740991,1741015,1741147,1741173,1741181,1741190,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741677,1741892,1741896,1742071,1742090,1742093,1742101,1742105,1742111,1742146,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742448,1742919,1742975,1742984,1742986,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744760,1745227,1745337,1746306,1746427,1746473,1746620,1746649,1746724,1746939,1746989,1747536,1747924,1748001,1748547,1748629,1748715,1749287,1749328,1749665-1749666,1750015,1750056,1750899,1750975,1750995,1751061,1751097,1752212,1752737,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755214,1755224,1755230,1755646-1755647,1755
650,1755675,1755693,1755717,1755884,1755890,1755918-1755919,1755942,1756013,1756019,1756039,1756408,1756410,1756898,1756939
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,1687551,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1692894,1692896,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,170
2923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,1703160,1703164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,1705842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710924,1710930,1710933,1710945,1711006,
1711016,1711022,1711026,1712163,1712225,1712228,1712233,1712250,1712254,1712489,1712547-1712548,1712588,1712617,1712645,1712654,1712695,1712765-1712766,1712771,1712775,1712859,1712876,1712898,1712902,1712905,1712912,1712974,1713129,1713168,1713184,1713285,1713362,1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715168,1715188,1715206,1715413,1715415,1715434,1715510-1715512,1715514-1715515,1715517-1715519,1715521,1715633,1715661,1715682,1715965,1716213-1716214,1716258,1716269,1716347,1716354,1716364,1716413,1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882,1716886,1716894,1717085,1717225,1717233,1717252,1717264,1717282,1717286,1717290,1717385,1717416,1717418,1717445,1717515,1717520,1717528,1717965,1717967-1717968,1717979,1718022,1718308,1718523,1718794,1718796,1718834,1718836-1718838,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,1719446,1719488,1719909-17199
10,1720200,1720234,1720394,1720439,1720445,1720448,1720462,1720506,1720652,1720654-1720655,1720711,1720752,1720769,1720776,1720804,1720815,1721303,1721307,1721311,1721314,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1721866,1721881,1721887,1722205,1722292,1722399,1722453,1722455,1722522,1722526,1722532,1722548,1722574,1722583,1722585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,1722923,1722939,1722945,1722996,1723068,1723127,1723155,1723250,1723316-1723318,1723368,1723371,1723375,1723377,1723380,1723410,1723414,1723437,1723484,1723486,1723493-1723494,1723500,1723552,1723554,1723683,1723707,1723736,1724012,1724232,1724252,1724325,1724427-1724428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1725165,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278,1725282,1725405,1725599,1725601,1725635,1725646,1725649-1725652,1725694,1725696-1725697,1725816,1725851,1725906-1725907,1725910,1725914,1725920,17
25926,1726177,1726202,1726628,1726632,1726637,1726639,1726648,1726651,1726654,1726669,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727899,1727914,1727917,1728091,1728138,1728433,1728448,1728664,1728677,1729185,1729361,1729625,1729730,1730101-1730102,1730137,1730612,1730946-1730975,1731008,1731055,1731079,1731283,1731856,1731882,1731946-1731958,1731976-1731983,1732359,1732488,1732900-1733448,1733602,1733617-1733963,1733978,1734113,1734128,1734192,1734258,1734301,1734418-1734454,1734466-1734512,1734522,1734592,1734594,1734597,1735041,1735577,1736162,1736209,1736280,1736646,1736836,1737119,1737280,1737339,1737632,1737664,1737715,1737834,1737903,1737959,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738643,1738850,1738982,1738996,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740509,1740520,1740535,1740707
,1740803,1740810,1740980,1740991,1741015,1741147,1741173,1741181,1741190,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741677,1741892,1741896,1742071,1742090,1742093,1742101,1742105,1742111,1742146,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742448,1742919,1742975,1742984,1742986,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744760,1745227,1745337,1746306,1746427,1746473,1746620,1746649,1746724,1746939,1746989,1747536,1747924,1748001,1748547,1748629,1748715,1749287,1749328,1749665-1749666,1750015,1750056,1750899,1750975,1750995,1751061,1751097,1752212,1752737,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755214,1755224,1755230,1755646-1755647,1755
650,1755675,1755693,1755717,1755884,1755890,1755918-1755919,1755942,1756013,1756019,1756039,1756408,1756410,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
Mon Aug 22 10:27:40 2016
@@ -2083,7 +2083,7 @@ public class ContextConfig implements Li
}
if ((javaClass.getAccessFlags() &
- org.apache.tomcat.util.bcel.Constants.ACC_ANNOTATION) > 0) {
+ org.apache.tomcat.util.bcel.Const.ACC_ANNOTATION) > 0) {
// Skip annotations.
return;
}
Propchange: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 10:27:40 2016
@@ -1,4 +1,4 @@
-/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1682271
-/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:1725719-1743695
+/commons/proper/bcel/trunk/src/main/java/org/apache/bcel:1149512-1682271,1747273-1757132
+/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:1725719-1747272
/jakarta/bcel/trunk/src/main/java/org/apache/bcel:886845-1149511
-/tomcat/trunk/java/org/apache/tomcat/util/bcel:1641634,1682311,1743696
+/tomcat/trunk/java/org/apache/tomcat/util/bcel:1641634,1682311,1743696,1757123-1757124,1757126,1757128,1757132-1757133
Copied: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Const.java (from
r1757134, tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Const.java?p2=tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Const.java&p1=tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java&r1=1757134&r2=1757135&rev=1757135&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/Const.java Mon Aug 22
10:27:40 2016
@@ -22,7 +22,7 @@ package org.apache.tomcat.util.bcel;
*
* @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
-public interface Constants {
+public interface Const {
/**
* One of the access flags for fields, methods, or classes.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
Mon Aug 22 10:27:40 2016
@@ -22,8 +22,8 @@ public class AnnotationElementValue exte
// For annotation element values, this is the annotation
private final AnnotationEntry annotationEntry;
- AnnotationElementValue(int type, AnnotationEntry annotationEntry,
- ConstantPool cpool)
+ AnnotationElementValue(final int type, final AnnotationEntry
annotationEntry,
+ final ConstantPool cpool)
{
super(type, cpool);
if (type != ANNOTATION) {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
Mon Aug 22 10:27:40 2016
@@ -22,34 +22,31 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
/**
* represents one annotation in the annotation table
- *
- * @author <A HREF="mailto:dbros...@mebigfatguy.com";>D. Brosius</A>
- * @since 6.0
*/
-public class AnnotationEntry implements Constants {
+public class AnnotationEntry {
private final int type_index;
private final ConstantPool constant_pool;
private final List<ElementValuePair> element_value_pairs;
- /**
+ /*
* Creates an AnnotationEntry from a DataInputStream
*
* @param input
* @param constant_pool
* @throws IOException
*/
- AnnotationEntry(DataInput input, ConstantPool constant_pool) throws
IOException {
+ AnnotationEntry(final DataInput input, final ConstantPool constant_pool)
throws IOException {
this.constant_pool = constant_pool;
type_index = input.readUnsignedShort();
- int num_element_value_pairs = input.readUnsignedShort();
+ final int num_element_value_pairs = input.readUnsignedShort();
element_value_pairs = new ArrayList<>(num_element_value_pairs);
for (int i = 0; i < num_element_value_pairs; i++) {
@@ -61,7 +58,7 @@ public class AnnotationEntry implements
* @return the annotation type name
*/
public String getAnnotationType() {
- final ConstantUtf8 c = (ConstantUtf8)
constant_pool.getConstant(type_index, CONSTANT_Utf8);
+ final ConstantUtf8 c = (ConstantUtf8)
constant_pool.getConstant(type_index, Const.CONSTANT_Utf8);
return c.getBytes();
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
Mon Aug 22 10:27:40 2016
@@ -22,9 +22,6 @@ import java.io.IOException;
/**
* base class for annotations
- *
- * @author <A HREF="mailto:dbros...@qis.net";>D. Brosius</A>
- * @since 6.0
*/
public class Annotations {
@@ -34,8 +31,8 @@ public class Annotations {
* @param input Input stream
* @param constant_pool Array of constants
*/
- Annotations(DataInput input, ConstantPool constant_pool) throws
IOException {
- final int annotation_table_length = (input.readUnsignedShort());
+ Annotations(final DataInput input, final ConstantPool constant_pool)
throws IOException {
+ final int annotation_table_length = input.readUnsignedShort();
annotation_table = new AnnotationEntry[annotation_table_length];
for (int i = 0; i < annotation_table_length; i++) {
annotation_table[i] = new AnnotationEntry(input, constant_pool);
@@ -44,7 +41,7 @@ public class Annotations {
/**
- * returns the array of annotation entries in this annotation
+ * @return the array of annotation entries in this annotation
*/
public AnnotationEntry[] getAnnotationEntries() {
return annotation_table;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
Mon Aug 22 10:27:40 2016
@@ -22,7 +22,7 @@ public class ArrayElementValue extends E
// For array types, this is the array
private final ElementValue[] evalues;
- ArrayElementValue(int type, ElementValue[] datums, ConstantPool cpool)
+ ArrayElementValue(final int type, final ElementValue[] datums, final
ConstantPool cpool)
{
super(type, cpool);
if (type != ARRAY) {
@@ -35,7 +35,7 @@ public class ArrayElementValue extends E
@Override
public String stringifyValue()
{
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
sb.append("[");
for (int i = 0; i < evalues.length; i++)
{
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java
Mon Aug 22 10:27:40 2016
@@ -17,7 +17,7 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
public class ClassElementValue extends ElementValue
{
@@ -26,7 +26,7 @@ public class ClassElementValue extends E
// For 'class' this points to the class entry in the cpool
private final int idx;
- ClassElementValue(int type, int idx, ConstantPool cpool) {
+ ClassElementValue(final int type, final int idx, final ConstantPool cpool)
{
super(type, cpool);
this.idx = idx;
}
@@ -35,8 +35,8 @@ public class ClassElementValue extends E
@Override
public String stringifyValue()
{
- ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(idx,
- Constants.CONSTANT_Utf8);
+ final ConstantUtf8 cu8 = (ConstantUtf8)
super.getConstantPool().getConstant(idx,
+ Const.CONSTANT_Utf8);
return cu8.getBytes();
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
Mon Aug 22 10:27:40 2016
@@ -21,8 +21,6 @@ package org.apache.tomcat.util.bcel.clas
* Thrown when the BCEL attempts to read a class file and determines
* that the file is malformed or otherwise cannot be interpreted as a
* class file.
- *
- * @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
public class ClassFormatException extends RuntimeException {
@@ -33,7 +31,7 @@ public class ClassFormatException extend
}
- public ClassFormatException(String s) {
+ public ClassFormatException(final String s) {
super(s);
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
Mon Aug 22 10:27:40 2016
@@ -23,7 +23,7 @@ import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
/**
* Wrapper class that parses a given Java .class file. The method <A
@@ -36,8 +36,6 @@ import org.apache.tomcat.util.bcel.Const
* exactly with the <A href="http://docs.oracle.com/javase/specs/";>
* JVM specification 1.0</a>. See this paper for
* further details about the structure of a bytecode file.
- *
- * @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
public final class ClassParser {
@@ -58,7 +56,7 @@ public final class ClassParser {
*
* @param inputStream Input stream
*/
- public ClassParser(InputStream inputStream) {
+ public ClassParser(final InputStream inputStream) {
this.dataInputStream = new DataInputStream(new
BufferedInputStream(inputStream, BUFSIZE));
}
@@ -71,8 +69,8 @@ public final class ClassParser {
* is performed by the java interpreter).
*
* @return Class object representing the parsed class file
- * @throws IOException
- * @throws ClassFormatException
+ * @throws IOException If an I/O occurs reading the byte code
+ * @throws ClassFormatException If the byte code is invalid
*/
public JavaClass parse() throws IOException, ClassFormatException {
/****************** Read headers ********************************/
@@ -108,7 +106,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readAttributes() throws IOException, ClassFormatException {
- int attributes_count = dataInputStream.readUnsignedShort();
+ final int attributes_count = dataInputStream.readUnsignedShort();
for (int i = 0; i < attributes_count; i++) {
ConstantUtf8 c;
String name;
@@ -117,7 +115,7 @@ public final class ClassParser {
// Get class name from constant pool via `name_index' indirection
name_index = dataInputStream.readUnsignedShort();
c = (ConstantUtf8) constant_pool.getConstant(name_index,
- Constants.CONSTANT_Utf8);
+ Const.CONSTANT_Utf8);
name = c.getBytes();
// Length of data in bytes
length = dataInputStream.readInt();
@@ -146,11 +144,11 @@ public final class ClassParser {
/* Interfaces are implicitely abstract, the flag should be set
* according to the JVM specification.
*/
- if ((access_flags & Constants.ACC_INTERFACE) != 0) {
- access_flags |= Constants.ACC_ABSTRACT;
+ if ((access_flags & Const.ACC_INTERFACE) != 0) {
+ access_flags |= Const.ACC_ABSTRACT;
}
- if (((access_flags & Constants.ACC_ABSTRACT) != 0)
- && ((access_flags & Constants.ACC_FINAL) != 0)) {
+ if (((access_flags & Const.ACC_ABSTRACT) != 0)
+ && ((access_flags & Const.ACC_FINAL) != 0)) {
throw new ClassFormatException("Class can't be both final and
abstract");
}
@@ -183,7 +181,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readFields() throws IOException, ClassFormatException {
- int fields_count = dataInputStream.readUnsignedShort();
+ final int fields_count = dataInputStream.readUnsignedShort();
for (int i = 0; i < fields_count; i++) {
Utility.swallowFieldOrMethod(dataInputStream);
}
@@ -210,7 +208,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readInterfaces() throws IOException, ClassFormatException {
- int interfaces_count = dataInputStream.readUnsignedShort();
+ final int interfaces_count = dataInputStream.readUnsignedShort();
if (interfaces_count > 0) {
interface_names = new String[interfaces_count];
for (int i = 0; i < interfaces_count; i++) {
@@ -229,7 +227,7 @@ public final class ClassParser {
* @throws ClassFormatException
*/
private void readMethods() throws IOException, ClassFormatException {
- int methods_count = dataInputStream.readUnsignedShort();
+ final int methods_count = dataInputStream.readUnsignedShort();
for (int i = 0; i < methods_count; i++) {
Utility.swallowFieldOrMethod(dataInputStream);
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
Mon Aug 22 10:27:40 2016
@@ -20,7 +20,7 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInput;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
/**
* Abstract superclass for classes to represent the different constant types
@@ -42,7 +42,7 @@ public abstract class Constant {
protected final byte tag;
- Constant(byte tag) {
+ Constant(final byte tag) {
this.tag = tag;
}
@@ -62,35 +62,35 @@ public abstract class Constant {
* @param input Input stream
* @return Constant object
*/
- static Constant readConstant(DataInput input) throws IOException,
+ static Constant readConstant(final DataInput input) throws IOException,
ClassFormatException {
- byte b = input.readByte(); // Read tag byte
+ final byte b = input.readByte(); // Read tag byte
int skipSize;
switch (b) {
- case Constants.CONSTANT_Class:
+ case Const.CONSTANT_Class:
return new ConstantClass(input);
- case Constants.CONSTANT_Integer:
+ case Const.CONSTANT_Integer:
return new ConstantInteger(input);
- case Constants.CONSTANT_Float:
+ case Const.CONSTANT_Float:
return new ConstantFloat(input);
- case Constants.CONSTANT_Long:
+ case Const.CONSTANT_Long:
return new ConstantLong(input);
- case Constants.CONSTANT_Double:
+ case Const.CONSTANT_Double:
return new ConstantDouble(input);
- case Constants.CONSTANT_Utf8:
+ case Const.CONSTANT_Utf8:
return ConstantUtf8.getInstance(input);
- case Constants.CONSTANT_String:
- case Constants.CONSTANT_MethodType:
+ case Const.CONSTANT_String:
+ case Const.CONSTANT_MethodType:
skipSize = 2; // unsigned short
break;
- case Constants.CONSTANT_MethodHandle:
+ case Const.CONSTANT_MethodHandle:
skipSize = 3; // unsigned byte, unsigned short
break;
- case Constants.CONSTANT_Fieldref:
- case Constants.CONSTANT_Methodref:
- case Constants.CONSTANT_InterfaceMethodref:
- case Constants.CONSTANT_NameAndType:
- case Constants.CONSTANT_InvokeDynamic:
+ case Const.CONSTANT_Fieldref:
+ case Const.CONSTANT_Methodref:
+ case Const.CONSTANT_InterfaceMethodref:
+ case Const.CONSTANT_NameAndType:
+ case Const.CONSTANT_InvokeDynamic:
skipSize = 4; // unsigned short, unsigned short
break;
default:
@@ -101,7 +101,6 @@ public abstract class Constant {
}
-
@Override
public String toString() {
return "[" + tag + "]";
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
Mon Aug 22 10:27:40 2016
@@ -20,14 +20,12 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInput;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
/**
- * This class is derived from the abstract
- * <A HREF="org.apache.tomcat.util.bcel.classfile.Constant.html">Constant</A>
class
+ * This class is derived from the abstract {@link Constant}
* and represents a reference to a (external) class.
*
- * @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
* @see Constant
*/
public final class ConstantClass extends Constant {
@@ -41,8 +39,8 @@ public final class ConstantClass extends
* @param file Input stream
* @throws IOException
*/
- ConstantClass(DataInput file) throws IOException {
- super(Constants.CONSTANT_Class);
+ ConstantClass(final DataInput file) throws IOException {
+ super(Const.CONSTANT_Class);
this.name_index = file.readUnsignedShort();
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
Mon Aug 22 10:27:40 2016
@@ -20,14 +20,12 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInput;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
/**
- * This class is derived from the abstract
- * <A HREF="org.apache.tomcat.util.bcel.classfile.Constant.html">Constant</A>
class
+ * This class is derived from the abstract {@link Constant}
* and represents a reference to a Double object.
*
- * @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
* @see Constant
*/
public final class ConstantDouble extends Constant {
@@ -41,8 +39,8 @@ public final class ConstantDouble extend
* @param file Input stream
* @throws IOException
*/
- ConstantDouble(DataInput file) throws IOException {
- super(Constants.CONSTANT_Double);
+ ConstantDouble(final DataInput file) throws IOException {
+ super(Const.CONSTANT_Double);
this.bytes = file.readDouble();
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
Mon Aug 22 10:27:40 2016
@@ -20,14 +20,12 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInput;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
/**
- * This class is derived from the abstract
- * <A HREF="org.apache.tomcat.util.bcel.classfile.Constant.html">Constant</A>
class
+ * This class is derived from the abstract {@link Constant}
* and represents a reference to a float object.
*
- * @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
* @see Constant
*/
public final class ConstantFloat extends Constant {
@@ -41,8 +39,8 @@ public final class ConstantFloat extends
* @param file Input stream
* @throws IOException
*/
- ConstantFloat(DataInput file) throws IOException {
- super(Constants.CONSTANT_Float);
+ ConstantFloat(final DataInput file) throws IOException {
+ super(Const.CONSTANT_Float);
this.bytes = file.readFloat();
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
Mon Aug 22 10:27:40 2016
@@ -20,14 +20,12 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInput;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
/**
- * This class is derived from the abstract
- * <A HREF="org.apache.tomcat.util.bcel.classfile.Constant.html">Constant</A>
class
+ * This class is derived from the abstract {@link Constant}
* and represents a reference to an int object.
*
- * @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
* @see Constant
*/
public final class ConstantInteger extends Constant {
@@ -41,8 +39,8 @@ public final class ConstantInteger exten
* @param file Input stream
* @throws IOException
*/
- ConstantInteger(DataInput file) throws IOException {
- super(Constants.CONSTANT_Integer);
+ ConstantInteger(final DataInput file) throws IOException {
+ super(Const.CONSTANT_Integer);
this.bytes = file.readInt();
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
Mon Aug 22 10:27:40 2016
@@ -20,14 +20,12 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInput;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
/**
- * This class is derived from the abstract
- * <A HREF="org.apache.tomcat.util.bcel.classfile.Constant.html">Constant</A>
class
+ * This class is derived from the abstract {@link Constant}
* and represents a reference to a long object.
*
- * @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
* @see Constant
*/
public final class ConstantLong extends Constant {
@@ -41,8 +39,8 @@ public final class ConstantLong extends
* @param file Input stream
* @throws IOException
*/
- ConstantLong(DataInput input) throws IOException {
- super(Constants.CONSTANT_Long);
+ ConstantLong(final DataInput input) throws IOException {
+ super(Const.CONSTANT_Long);
this.bytes = input.readLong();
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
Mon Aug 22 10:27:40 2016
@@ -20,7 +20,7 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInput;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
/**
* This class represents the constant pool, i.e., a table of constants, of
@@ -31,7 +31,6 @@ import org.apache.tomcat.util.bcel.Const
* ConstantPoolGen</a>.
* @see Constant
- * @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
public class ConstantPool {
@@ -45,8 +44,8 @@ public class ConstantPool {
* @throws IOException
* @throws ClassFormatException
*/
- ConstantPool(DataInput input) throws IOException, ClassFormatException {
- int constant_pool_count = input.readUnsignedShort();
+ ConstantPool(final DataInput input) throws IOException,
ClassFormatException {
+ final int constant_pool_count = input.readUnsignedShort();
constant_pool = new Constant[constant_pool_count];
/* constant_pool[0] is unused by the compiler and may be used freely
* by the implementation.
@@ -62,7 +61,7 @@ public class ConstantPool {
*/
if (constant_pool[i] != null) {
byte tag = constant_pool[i].getTag();
- if ((tag == Constants.CONSTANT_Double) || (tag ==
Constants.CONSTANT_Long)) {
+ if ((tag == Const.CONSTANT_Double) || (tag ==
Const.CONSTANT_Long)) {
i++;
}
}
@@ -77,7 +76,7 @@ public class ConstantPool {
* @return Constant value
* @see Constant
*/
- public Constant getConstant( int index ) {
+ public Constant getConstant( final int index ) {
if (index >= constant_pool.length || index < 0) {
throw new ClassFormatException("Invalid constant pool reference: "
+ index
+ ". Constant pool size is: " + constant_pool.length);
@@ -94,16 +93,16 @@ public class ConstantPool {
* @param tag Tag of expected constant, i.e., its type
* @return Constant value
* @see Constant
- * @throws ClassFormatException
+ * @throws ClassFormatException If the constant is not of the expected
type
*/
- public Constant getConstant( int index, byte tag ) throws
ClassFormatException {
+ public Constant getConstant( final int index, final byte tag ) throws
ClassFormatException {
Constant c;
c = getConstant(index);
if (c == null) {
throw new ClassFormatException("Constant pool at index " + index +
" is null.");
}
if (c.getTag() != tag) {
- throw new ClassFormatException("Expected class `" +
Constants.CONSTANT_NAMES[tag]
+ throw new ClassFormatException("Expected class `" +
Const.getConstantName(tag)
+ "' at index " + index + " and got " + c);
}
return c;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
Mon Aug 22 10:27:40 2016
@@ -19,14 +19,13 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInput;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
/**
* This class is derived from the abstract
* <A HREF="org.apache.tomcat.util.bcel.classfile.Constant.html">Constant</A>
class
* and represents a reference to a Utf8 encoded string.
*
- * @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
* @see Constant
*/
public final class ConstantUtf8 extends Constant {
@@ -34,7 +33,7 @@ public final class ConstantUtf8 extends
private final String bytes;
- static ConstantUtf8 getInstance(DataInput input) throws IOException {
+ static ConstantUtf8 getInstance(final DataInput input) throws IOException {
return new ConstantUtf8(input.readUTF());
}
@@ -42,8 +41,8 @@ public final class ConstantUtf8 extends
/**
* @param bytes Data
*/
- private ConstantUtf8(String bytes) {
- super(Constants.CONSTANT_Utf8);
+ private ConstantUtf8(final String bytes) {
+ super(Const.CONSTANT_Utf8);
if (bytes == null) {
throw new IllegalArgumentException("bytes must not be null!");
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
Mon Aug 22 10:27:40 2016
@@ -19,18 +19,14 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInput;
import java.io.IOException;
-/**
- * @author <A HREF="mailto:dbros...@qis.net";>D. Brosius</A>
- * @since 6.0
- */
public abstract class ElementValue
{
- protected final int type;
+ private final int type;
- protected final ConstantPool cpool;
+ private final ConstantPool cpool;
- ElementValue(int type, ConstantPool cpool) {
+ ElementValue(final int type, final ConstantPool cpool) {
this.type = type;
this.cpool = cpool;
}
@@ -51,9 +47,9 @@ public abstract class ElementValue
public static final byte PRIMITIVE_SHORT = 'S';
public static final byte PRIMITIVE_BOOLEAN = 'Z';
- public static ElementValue readElementValue(DataInput input, ConstantPool
cpool) throws IOException
+ public static ElementValue readElementValue(final DataInput input, final
ConstantPool cpool) throws IOException
{
- byte type = input.readByte();
+ final byte type = input.readByte();
switch (type)
{
case PRIMITIVE_BYTE:
@@ -79,8 +75,8 @@ public abstract class ElementValue
return new AnnotationElementValue(ANNOTATION, new
AnnotationEntry(input, cpool), cpool);
case ARRAY:
- int numArrayVals = input.readUnsignedShort();
- ElementValue[] evalues = new ElementValue[numArrayVals];
+ final int numArrayVals = input.readUnsignedShort();
+ final ElementValue[] evalues = new ElementValue[numArrayVals];
for (int j = 0; j < numArrayVals; j++)
{
evalues[j] = ElementValue.readElementValue(input, cpool);
@@ -92,4 +88,12 @@ public abstract class ElementValue
"Unexpected element value kind in annotation: " +
type);
}
}
+
+ final ConstantPool getConstantPool() {
+ return cpool;
+ }
+
+ final int getType() {
+ return type;
+ }
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
Mon Aug 22 10:27:40 2016
@@ -20,12 +20,11 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInput;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
/**
* an annotation's element value pair
*
- * @author <A HREF="mailto:dbros...@qis.net";>D. Brosius</A>
* @since 6.0
*/
public class ElementValuePair
@@ -36,7 +35,7 @@ public class ElementValuePair
private final int elementNameIndex;
- ElementValuePair(DataInput file, ConstantPool constantPool) throws
IOException {
+ ElementValuePair(final DataInput file, final ConstantPool constantPool)
throws IOException {
this.constantPool = constantPool;
this.elementNameIndex = file.readUnsignedShort();
this.elementValue = ElementValue.readElementValue(file, constantPool);
@@ -44,8 +43,8 @@ public class ElementValuePair
public String getNameString()
{
- ConstantUtf8 c = (ConstantUtf8) constantPool.getConstant(
- elementNameIndex, Constants.CONSTANT_Utf8);
+ final ConstantUtf8 c = (ConstantUtf8) constantPool.getConstant(
+ elementNameIndex, Const.CONSTANT_Utf8);
return c.getBytes();
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
Mon Aug 22 10:27:40 2016
@@ -17,13 +17,13 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
public class EnumElementValue extends ElementValue
{
private final int valueIdx;
- EnumElementValue(int type, int valueIdx, ConstantPool cpool) {
+ EnumElementValue(final int type, final int valueIdx, final ConstantPool
cpool) {
super(type, cpool);
if (type != ENUM_CONSTANT)
throw new RuntimeException(
@@ -34,8 +34,8 @@ public class EnumElementValue extends El
@Override
public String stringifyValue()
{
- ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(valueIdx,
- Constants.CONSTANT_Utf8);
+ final ConstantUtf8 cu8 = (ConstantUtf8)
super.getConstantPool().getConstant(valueIdx,
+ Const.CONSTANT_Utf8);
return cu8.getBytes();
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
Mon Aug 22 10:27:40 2016
@@ -24,8 +24,6 @@ package org.apache.tomcat.util.bcel.clas
* The intent of this class is to represent a parsed or otherwise existing
* class file. Those interested in programatically generating classes
* should see the <a href="../generic/ClassGen.html">ClassGen</a> class.
-
- * @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
public class JavaClass {
@@ -45,9 +43,9 @@ public class JavaClass {
* @param interfaces Implemented interfaces
* @param runtimeVisibleAnnotations "RuntimeVisibleAnnotations" attribute
defined on the Class, or null
*/
- JavaClass(String class_name, String superclass_name,
- int access_flags, ConstantPool constant_pool, String[]
interface_names,
- Annotations runtimeVisibleAnnotations) {
+ JavaClass(final String class_name, final String superclass_name,
+ final int access_flags, final ConstantPool constant_pool, final
String[] interface_names,
+ final Annotations runtimeVisibleAnnotations) {
this.access_flags = access_flags;
this.runtimeVisibleAnnotations = runtimeVisibleAnnotations;
this.class_name = class_name;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
Mon Aug 22 10:27:40 2016
@@ -17,13 +17,13 @@
*/
package org.apache.tomcat.util.bcel.classfile;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
public class SimpleElementValue extends ElementValue
{
private final int index;
- SimpleElementValue(int type, int index, ConstantPool cpool) {
+ SimpleElementValue(final int type, final int index, final ConstantPool
cpool) {
super(type, cpool);
this.index = index;
}
@@ -41,51 +41,51 @@ public class SimpleElementValue extends
@Override
public String stringifyValue()
{
- switch (type)
+ final ConstantPool cpool = super.getConstantPool();
+ final int _type = super.getType();
+ switch (_type)
{
case PRIMITIVE_INT:
- ConstantInteger c = (ConstantInteger) cpool.getConstant(getIndex(),
- Constants.CONSTANT_Integer);
+ final ConstantInteger c = (ConstantInteger)
cpool.getConstant(getIndex(),
+ Const.CONSTANT_Integer);
return Integer.toString(c.getBytes());
case PRIMITIVE_LONG:
- ConstantLong j = (ConstantLong) cpool.getConstant(getIndex(),
- Constants.CONSTANT_Long);
+ final ConstantLong j = (ConstantLong) cpool.getConstant(getIndex(),
+ Const.CONSTANT_Long);
return Long.toString(j.getBytes());
case PRIMITIVE_DOUBLE:
- ConstantDouble d = (ConstantDouble) cpool.getConstant(getIndex(),
- Constants.CONSTANT_Double);
+ final ConstantDouble d = (ConstantDouble)
cpool.getConstant(getIndex(),
+ Const.CONSTANT_Double);
return Double.toString(d.getBytes());
case PRIMITIVE_FLOAT:
- ConstantFloat f = (ConstantFloat) cpool.getConstant(getIndex(),
- Constants.CONSTANT_Float);
+ final ConstantFloat f = (ConstantFloat)
cpool.getConstant(getIndex(),
+ Const.CONSTANT_Float);
return Float.toString(f.getBytes());
case PRIMITIVE_SHORT:
- ConstantInteger s = (ConstantInteger) cpool.getConstant(getIndex(),
- Constants.CONSTANT_Integer);
+ final ConstantInteger s = (ConstantInteger)
cpool.getConstant(getIndex(),
+ Const.CONSTANT_Integer);
return Integer.toString(s.getBytes());
case PRIMITIVE_BYTE:
- ConstantInteger b = (ConstantInteger) cpool.getConstant(getIndex(),
- Constants.CONSTANT_Integer);
+ final ConstantInteger b = (ConstantInteger)
cpool.getConstant(getIndex(),
+ Const.CONSTANT_Integer);
return Integer.toString(b.getBytes());
case PRIMITIVE_CHAR:
- ConstantInteger ch = (ConstantInteger) cpool.getConstant(
- getIndex(), Constants.CONSTANT_Integer);
+ final ConstantInteger ch = (ConstantInteger) cpool.getConstant(
+ getIndex(), Const.CONSTANT_Integer);
return String.valueOf((char)ch.getBytes());
case PRIMITIVE_BOOLEAN:
- ConstantInteger bo = (ConstantInteger) cpool.getConstant(
- getIndex(), Constants.CONSTANT_Integer);
+ final ConstantInteger bo = (ConstantInteger) cpool.getConstant(
+ getIndex(), Const.CONSTANT_Integer);
if (bo.getBytes() == 0) {
return "false";
}
return "true";
case STRING:
- ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(getIndex(),
- Constants.CONSTANT_Utf8);
+ final ConstantUtf8 cu8 = (ConstantUtf8)
cpool.getConstant(getIndex(),
+ Const.CONSTANT_Utf8);
return cu8.getBytes();
default:
- throw new RuntimeException(
- "SimpleElementValue class does not know how to stringify
type "
- + type);
+ throw new RuntimeException("SimpleElementValue class does not know
how to stringify type " + _type);
}
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
Mon Aug 22 10:27:40 2016
@@ -20,12 +20,10 @@ import java.io.DataInput;
import java.io.EOFException;
import java.io.IOException;
-import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Const;
/**
* Utility functions that do not really belong to any class in particular.
- *
- * @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
final class Utility {
@@ -42,29 +40,29 @@ final class Utility {
* @param str The long class name
* @return Compacted class name
*/
- static String compactClassName(String str) {
+ static String compactClassName(final String str) {
return str.replace('/', '.'); // Is `/' on all systems, even DOS
}
- static String getClassName(ConstantPool constant_pool, int index) {
- Constant c = constant_pool.getConstant(index,
Constants.CONSTANT_Class);
+ static String getClassName(final ConstantPool constant_pool, final int
index) {
+ Constant c = constant_pool.getConstant(index, Const.CONSTANT_Class);
int i = ((ConstantClass) c).getNameIndex();
// Finally get the string from the constant pool
- c = constant_pool.getConstant(i, Constants.CONSTANT_Utf8);
+ c = constant_pool.getConstant(i, Const.CONSTANT_Utf8);
String name = ((ConstantUtf8) c).getBytes();
return compactClassName(name);
}
- static void skipFully(DataInput file, int length) throws IOException {
+ static void skipFully(final DataInput file, final int length) throws
IOException {
int total = file.skipBytes(length);
if (total != length) {
throw new EOFException();
}
}
- static void swallowFieldOrMethod(DataInput file)
+ static void swallowFieldOrMethod(final DataInput file)
throws IOException {
// file.readUnsignedShort(); // Unused access flags
// file.readUnsignedShort(); // name index
@@ -77,7 +75,7 @@ final class Utility {
}
}
- static void swallowAttribute(DataInput file)
+ static void swallowAttribute(final DataInput file)
throws IOException {
//file.readUnsignedShort(); // Unused name index
skipFully(file, 2);
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1757135&r1=1757134&r2=1757135&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Aug 22 10:27:40 2016
@@ -329,6 +329,10 @@
<fix>
Fixed typos in mbeans-descriptors.xml files. (violetagg)
</fix>
+ <update>
+ Update the internal fork of Commons BCEL to r1757132 to align with the
+ BCEL 6 release. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
