Author: violetagg
Date: Tue Dec 8 08:17:38 2015
New Revision: 1718527
URL: http://svn.apache.org/viewvc?rev=1718527&view=rev
Log:
Merged revision 1718523 from tomcat/trunk:
Classes are final but declare protected fields. Reported by Findbugs.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManager.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ssi/SSIFsize.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/Request.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/Response.java
tomcat/tc8.0.x/trunk/java/org/apache/el/util/MessageFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 8 08:17:38 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
609,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1
666569,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573
9,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,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,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,1702923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,170
3143,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,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715188,1715206,1715413,1715415,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,1718022,1718308
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1657592,1657607,1657
609,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1
666569,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,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573
9,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,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,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,1702923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,170
3143,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,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715188,1715206,1715413,1715415,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,1718022,1718308,1718523
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Tue Dec 8 08:17:38 2015
@@ -63,9 +63,9 @@ import org.apache.tomcat.util.res.String
*/
final class ApplicationDispatcher implements AsyncDispatcher,
RequestDispatcher {
- protected static final boolean STRICT_SERVLET_COMPLIANCE;
+ static final boolean STRICT_SERVLET_COMPLIANCE;
- protected static final boolean WRAP_SAME_OBJECT;
+ static final boolean WRAP_SAME_OBJECT;
static {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
Tue Dec 8 08:17:38 2015
@@ -58,7 +58,7 @@ public final class ApplicationFilterConf
private static final long serialVersionUID = 1L;
- protected static final StringManager sm =
+ static final StringManager sm =
StringManager.getManager(Constants.Package);
private static final org.apache.juli.logging.Log log =
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
Tue Dec 8 08:17:38 2015
@@ -58,9 +58,9 @@ final class StandardHostValve extends Va
private static final ClassLoader MY_CLASSLOADER =
StandardHostValve.class.getClassLoader();
- protected static final boolean STRICT_SERVLET_COMPLIANCE;
+ static final boolean STRICT_SERVLET_COMPLIANCE;
- protected static final boolean ACCESS_SESSION;
+ static final boolean ACCESS_SESSION;
static {
STRICT_SERVLET_COMPLIANCE = Globals.STRICT_SERVLET_COMPLIANCE;
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardServer.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardServer.java Tue
Dec 8 08:17:38 2015
@@ -147,7 +147,7 @@ public final class StandardServer extend
/**
* The property change support for this component.
*/
- protected final PropertyChangeSupport support = new
PropertyChangeSupport(this);
+ final PropertyChangeSupport support = new PropertyChangeSupport(this);
private volatile boolean stopAwait = false;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Tue Dec 8 08:17:38 2015
@@ -78,16 +78,13 @@ public final class HTMLManagerServlet ex
private static final long serialVersionUID = 1L;
- protected static final URLEncoder URL_ENCODER;
- protected static final String APPLICATION_MESSAGE = "message";
- protected static final String APPLICATION_ERROR = "error";
+ static final URLEncoder URL_ENCODER;
+ static final String APPLICATION_MESSAGE = "message";
+ static final String APPLICATION_ERROR = "error";
- protected static final String sessionsListJspPath =
- "/WEB-INF/jsp/sessionsList.jsp";
- protected static final String sessionDetailJspPath =
- "/WEB-INF/jsp/sessionDetail.jsp";
- protected static final String connectorCiphersJspPath =
- "/WEB-INF/jsp/connectorCiphers.jsp";
+ static final String sessionsListJspPath = "/WEB-INF/jsp/sessionsList.jsp";
+ static final String sessionDetailJspPath =
"/WEB-INF/jsp/sessionDetail.jsp";
+ static final String connectorCiphersJspPath =
"/WEB-INF/jsp/connectorCiphers.jsp";
static {
URL_ENCODER = new URLEncoder();
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java Tue Dec 8
08:17:38 2015
@@ -47,7 +47,7 @@ public final class Mapper {
private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog(Mapper.class);
- protected static final StringManager sm =
+ static final StringManager sm =
StringManager.getManager(Mapper.class.getPackage().getName());
// ----------------------------------------------------- Instance Variables
@@ -56,20 +56,20 @@ public final class Mapper {
/**
* Array containing the virtual hosts definitions.
*/
- protected volatile MappedHost[] hosts = new MappedHost[0];
+ volatile MappedHost[] hosts = new MappedHost[0];
/**
* Default host name.
*/
- protected String defaultHostName = null;
+ String defaultHostName = null;
/**
* Mapping from Context object to Context version to support
* RequestDispatcher mappings.
*/
- protected Map<Context, ContextVersion> contextObjectToContextVersionMap =
+ Map<Context, ContextVersion> contextObjectToContextVersionMap =
new ConcurrentHashMap<>();
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManager.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManager.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManager.java
Tue Dec 8 08:17:38 2015
@@ -40,7 +40,7 @@ public final class PersistentManager ext
/**
* The descriptive name of this Manager implementation (for logging).
*/
- protected static final String name = "PersistentManager";
+ static final String name = "PersistentManager";
// ------------------------------------------------------------- Properties
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/ssi/SSIFsize.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ssi/SSIFsize.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ssi/SSIFsize.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ssi/SSIFsize.java Tue Dec 8
08:17:38 2015
@@ -29,8 +29,8 @@ import java.text.DecimalFormat;
* @author David Becker
*/
public final class SSIFsize implements SSICommand {
- protected static final int ONE_KILOBYTE = 1024;
- protected static final int ONE_MEGABYTE = 1024 * 1024;
+ static final int ONE_KILOBYTE = 1024;
+ static final int ONE_MEGABYTE = 1024 * 1024;
/**
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java Tue
Dec 8 08:17:38 2015
@@ -133,9 +133,9 @@ public final class Bootstrap {
private Object catalinaDaemon = null;
- protected ClassLoader commonLoader = null;
- protected ClassLoader catalinaLoader = null;
- protected ClassLoader sharedLoader = null;
+ ClassLoader commonLoader = null;
+ ClassLoader catalinaLoader = null;
+ ClassLoader sharedLoader = null;
// -------------------------------------------------------- Private Methods
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/UserConfig.java Tue
Dec 8 08:17:38 2015
@@ -101,12 +101,12 @@ public final class UserConfig
/**
* A regular expression defining user who deployment is allowed.
*/
- protected Pattern allow = null;
+ Pattern allow = null;
/**
* A regular expression defining user who deployment is denied.
*/
- protected Pattern deny = null;
+ Pattern deny = null;
// ------------------------------------------------------------- Properties
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java Tue Dec
8 08:17:38 2015
@@ -30,7 +30,7 @@ import org.apache.catalina.tribes.util.A
public final class UniqueId implements Serializable{
private static final long serialVersionUID = 1L;
- protected final byte[] id;
+ final byte[] id;
public UniqueId() {
this(null);
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/io/ReplicationStream.java
Tue Dec 8 08:17:38 2015
@@ -37,7 +37,7 @@ import org.apache.catalina.tribes.util.S
*/
public final class ReplicationStream extends ObjectInputStream {
- protected static final StringManager sm =
+ static final StringManager sm =
StringManager.getManager(ReplicationStream.class.getPackage().getName());
/**
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
Tue Dec 8 08:17:38 2015
@@ -165,23 +165,23 @@ public final class JDBCAccessLogValve ex
* Use long contentLength as you have more 4 GB output.
* @since 6.0.15
*/
- protected boolean useLongContentLength = false ;
+ boolean useLongContentLength = false ;
/**
* The connection username to use when trying to connect to the database.
*/
- protected String connectionName = null;
+ String connectionName = null;
/**
* The connection URL to use when trying to connect to the database.
*/
- protected String connectionPassword = null;
+ String connectionPassword = null;
/**
* Instance of the JDBC Driver class we use as a connection factory.
*/
- protected Driver driver = null;
+ Driver driver = null;
private String driverName;
@@ -210,7 +210,7 @@ public final class JDBCAccessLogValve ex
/**
* @see #setRequestAttributesEnabled(boolean)
*/
- protected boolean requestAttributesEnabled = true;
+ boolean requestAttributesEnabled = true;
// ------------------------------------------------------------- Properties
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
Tue Dec 8 08:17:38 2015
@@ -41,7 +41,7 @@ public final class RemoteAddrValve exten
* compared in the filtering method. The port will be appended
* using a ";" as a separator.
*/
- protected volatile boolean addConnectorPort = false;
+ volatile boolean addConnectorPort = false;
// ------------------------------------------------------------- Properties
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
Tue Dec 8 08:17:38 2015
@@ -41,7 +41,7 @@ public final class RemoteHostValve exten
* compared in the filtering method. The port will be appended
* using a ";" as a separator.
*/
- protected volatile boolean addConnectorPort = false;
+ volatile boolean addConnectorPort = false;
// ------------------------------------------------------------- Properties
Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/Request.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/Request.java Tue Dec 8
08:17:38 2015
@@ -143,7 +143,7 @@ public final class Request {
private final RequestInfo reqProcessorMX=new RequestInfo(this);
- protected volatile ReadListener listener;
+ volatile ReadListener listener;
public ReadListener getReadListener() {
return listener;
Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/Response.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/Response.java Tue Dec 8
08:17:38 2015
@@ -58,37 +58,37 @@ public final class Response {
/**
* Status code.
*/
- protected int status = 200;
+ int status = 200;
/**
* Status message.
*/
- protected String message = null;
+ String message = null;
/**
* Response headers.
*/
- protected final MimeHeaders headers = new MimeHeaders();
+ final MimeHeaders headers = new MimeHeaders();
/**
* Associated output buffer.
*/
- protected OutputBuffer outputBuffer;
+ OutputBuffer outputBuffer;
/**
* Notes.
*/
- protected final Object notes[] = new Object[Constants.MAX_NOTES];
+ final Object notes[] = new Object[Constants.MAX_NOTES];
/**
* Committed flag.
*/
- protected volatile boolean commited = false;
+ volatile boolean commited = false;
/**
@@ -100,10 +100,10 @@ public final class Response {
/**
* HTTP specific fields.
*/
- protected String contentType = null;
- protected String contentLanguage = null;
- protected String characterEncoding = Constants.DEFAULT_CHARACTER_ENCODING;
- protected long contentLength = -1;
+ String contentType = null;
+ String contentLanguage = null;
+ String characterEncoding = Constants.DEFAULT_CHARACTER_ENCODING;
+ long contentLength = -1;
private Locale locale = DEFAULT_LOCALE;
// General informations
@@ -113,14 +113,14 @@ public final class Response {
/**
* Holds request error exception.
*/
- protected Exception errorException = null;
+ Exception errorException = null;
/**
* Has the charset been explicitly set.
*/
- protected boolean charsetSet = false;
+ boolean charsetSet = false;
- protected Request req;
+ Request req;
// ------------------------------------------------------------- Properties
@@ -549,7 +549,7 @@ public final class Response {
* easily reachable from the CoyoteOutputStream and the Processor which
both
* need access to state.
*/
- protected volatile WriteListener listener;
+ volatile WriteListener listener;
private boolean fireListener = false;
private boolean registeredForWrite = false;
private final Object nonBlockingStateLock = new Object();
Modified: tomcat/tc8.0.x/trunk/java/org/apache/el/util/MessageFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/el/util/MessageFactory.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/el/util/MessageFactory.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/el/util/MessageFactory.java Tue Dec 8
08:17:38 2015
@@ -24,7 +24,7 @@ import java.util.ResourceBundle;
*/
public final class MessageFactory {
- protected static final ResourceBundle bundle =
+ static final ResourceBundle bundle =
ResourceBundle.getBundle("org.apache.el.Messages");
public MessageFactory() {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/juli/ClassLoaderLogManager.java Tue
Dec 8 08:17:38 2015
@@ -663,9 +663,9 @@ public class ClassLoaderLogManager exten
protected static final class LogNode {
Logger logger;
- protected final Map<String, LogNode> children = new HashMap<>();
+ final Map<String, LogNode> children = new HashMap<>();
- protected final LogNode parent;
+ final LogNode parent;
LogNode(final LogNode parent, final Logger logger) {
this.parent = parent;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java?rev=1718527&r1=1718526&r2=1718527&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
Tue Dec 8 08:17:38 2015
@@ -703,7 +703,7 @@ public class WebRuleSet extends RuleSetB
* only 1 time within the web.xml
*/
final class SetLoginConfig extends Rule {
- protected boolean isLoginConfigSet = false;
+ boolean isLoginConfigSet = false;
public SetLoginConfig() {
// NO-OP
}
@@ -726,7 +726,7 @@ final class SetLoginConfig extends Rule
* only 1 time within the web.xml
*/
final class SetJspConfig extends Rule {
- protected boolean isJspConfigSet = false;
+ boolean isJspConfigSet = false;
public SetJspConfig() {
// NO-OP
}
@@ -749,7 +749,7 @@ final class SetJspConfig extends Rule {
* only 1 time within the web.xml
*/
final class SetSessionConfig extends Rule {
- protected boolean isSessionConfigSet = false;
+ boolean isSessionConfigSet = false;
public SetSessionConfig() {
// NO-OP
}
@@ -946,7 +946,7 @@ final class CallParamMultiRule extends C
*/
final class CallMethodMultiRule extends CallMethodRule {
- protected final int multiParamIndex;
+ final int multiParamIndex;
public CallMethodMultiRule(String methodName, int paramCount, int
multiParamIndex) {
super(methodName, paramCount);
@@ -1103,7 +1103,7 @@ final class VersionRule extends Rule {
*/
final class NameRule extends Rule {
- protected boolean isNameSet = false;
+ boolean isNameSet = false;
public NameRule() {
// NO-OP
@@ -1134,7 +1134,7 @@ final class NameRule extends Rule {
*/
final class AbsoluteOrderingRule extends Rule {
- protected boolean isAbsoluteOrderingSet = false;
+ boolean isAbsoluteOrderingSet = false;
private final boolean fragment;
public AbsoluteOrderingRule(boolean fragment) {
@@ -1168,7 +1168,7 @@ final class AbsoluteOrderingRule extends
*/
final class RelativeOrderingRule extends Rule {
- protected boolean isRelativeOrderingSet = false;
+ boolean isRelativeOrderingSet = false;
private final boolean fragment;
public RelativeOrderingRule(boolean fragment) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
