Author: markt
Date: Fri Jan 22 12:30:37 2016
New Revision: 1726195
URL: http://svn.apache.org/viewvc?rev=1726195&view=rev
Log:
Clarify behaviour of Manager.context
Note: This does not impact Context.manager
A Manager can only be used with a single Context and must then be destroyed
when no longer required
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Manager.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnListener.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 22 12:30:37 2016
@@ -1 +1 @@
-/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,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,170
3024,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,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-1719910,1720200,1720234,1720394,17204
39,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,1724252,1724325,1724427-1724428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1725165,1725183,1725199,1725202,1725204,1725207,1725264,1725266,1725278,1725282,1725599,1725601,1725635,1725816,1725851,1725906-1725907,1725910,1725920,1725926,1726177
+/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,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,170
3024,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,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-1719910,1720200,1720234,1720394,17204
39,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,1724252,1724325,1724427-1724428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1725165,1725183,1725199,1725202,1725204,1725207,1725264,1725266,1725278,1725282,1725599,1725601,1725635,1725646,1725816,1725851,1725906-1725907,1725910,1725920,1725926,1726177
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/Manager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/Manager.java?rev=1726195&r1=1726194&r2=1726195&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/Manager.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/Manager.java Fri Jan 22
12:30:37 2016
@@ -76,7 +76,11 @@ public interface Manager {
/**
- * Set the Container with which this Manager is associated.
+ * Set the Context with which this Manager is associated. The Context must
+ * be set to a non-null value before the Manager is first used. Multiple
+ * calls to this method before first use are permitted. Once the Manager
has
+ * been used, this method may not be used to change the Context (including
+ * setting a {@code null} value) that the Manager is associated with.
*
* @param context The newly associated Context
*/
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnListener.java?rev=1726195&r1=1726194&r2=1726195&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnListener.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnListener.java
Fri Jan 22 12:30:37 2016
@@ -48,9 +48,6 @@ public class SingleSignOnListener implem
return;
}
Context context = manager.getContext();
- if (context == null) {
- return;
- }
Authenticator authenticator = context.getAuthenticator();
if (!(authenticator instanceof AuthenticatorBase)) {
return;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1726195&r1=1726194&r2=1726195&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Fri
Jan 22 12:30:37 2016
@@ -1704,16 +1704,6 @@ public class StandardContext extends Con
support.firePropertyChange("distributable",
oldDistributable,
this.distributable);
-
- // Bugzilla 32866
- Manager manager = getManager();
- if(manager != null) {
- if(log.isDebugEnabled()) {
- log.debug("Propagating distributable=" + distributable
- + " to manager");
- }
- manager.setDistributable(distributable);
- }
}
@@ -1839,20 +1829,20 @@ public class StandardContext extends Con
this.manager = manager;
// Stop the old component if necessary
- if (getState().isAvailable() && (oldManager != null) &&
- (oldManager instanceof Lifecycle)) {
+ if (oldManager instanceof Lifecycle) {
try {
((Lifecycle) oldManager).stop();
+ ((Lifecycle) oldManager).destroy();
} catch (LifecycleException e) {
- log.error("StandardContext.setManager: stop: ", e);
+ log.error("StandardContext.setManager: stop-destroy: ", e);
}
}
// Start the new component if necessary
- if (manager != null)
+ if (manager != null) {
manager.setContext(this);
- if (getState().isAvailable() && (manager != null) &&
- (manager instanceof Lifecycle)) {
+ }
+ if (getState().isAvailable() && manager instanceof Lifecycle) {
try {
((Lifecycle) manager).start();
} catch (LifecycleException e) {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1726195&r1=1726194&r2=1726195&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
Fri Jan 22 12:30:37 2016
@@ -463,13 +463,11 @@ public class SimpleTcpCluster extends Li
String clusterName = name ;
if (clusterName == null) clusterName = manager.getContext().getName();
if (getContainer() instanceof Engine) {
- Context context = manager.getContext() ;
- if(context != null) {
- Container host = context.getParent();
- if(host != null && host instanceof Host && clusterName!=null &&
- !(clusterName.startsWith(host.getName() +"#"))) {
- clusterName = host.getName() +"#" + clusterName ;
- }
+ Context context = manager.getContext();
+ Container host = context.getParent();
+ if (host instanceof Host && clusterName != null &&
+ !(clusterName.startsWith(host.getName() +"#"))) {
+ clusterName = host.getName() +"#" + clusterName ;
}
}
return clusterName;
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/FileStore.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/FileStore.java?rev=1726195&r1=1726194&r2=1726195&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/FileStore.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/FileStore.java Fri
Jan 22 12:30:37 2016
@@ -334,23 +334,16 @@ public final class FileStore extends Sto
File file = new File(this.directory);
if (!file.isAbsolute()) {
Context context = manager.getContext();
- if (context != null) {
- ServletContext servletContext = context.getServletContext();
- File work = (File)
- servletContext.getAttribute(ServletContext.TEMPDIR);
- file = new File(work, this.directory);
- } else {
- throw new IllegalArgumentException("Parent Container is not a
Context");
- }
+ ServletContext servletContext = context.getServletContext();
+ File work = (File)
servletContext.getAttribute(ServletContext.TEMPDIR);
+ file = new File(work, this.directory);
}
if (!file.exists() || !file.isDirectory()) {
if (!file.delete() && file.exists()) {
- throw new IOException(
- sm.getString("fileStore.deleteFailed", file));
+ throw new IOException(sm.getString("fileStore.deleteFailed",
file));
}
if (!file.mkdirs() && !file.isDirectory()) {
- throw new IOException(
- sm.getString("fileStore.createFailed", file));
+ throw new IOException(sm.getString("fileStore.createFailed",
file));
}
}
this.directoryFile = file;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1726195&r1=1726194&r2=1726195&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
Fri Jan 22 12:30:37 2016
@@ -31,8 +31,10 @@ JDBCStore.wrongDataSource=Cannot open JN
JDBCStore.missingDataSourceName=No valid JNDI name was given.
JDBCStore.commitSQLException=SQLException committing connection before closing
managerBase.container.noop=Managers added to containers other than Contexts
will never be used
+managerBase.contextNull=The Context must be set to a non-null value before the
Manager is used
managerBase.createSession.ise=createSession: Too many active sessions
managerBase.sessionTimeout=Invalid session timeout setting {0}
+managerBase.setContextNotNew=It is illegal to call setContext() to change the
Context associated with a Manager if the Manager is not in the NEW state
standardManager.loading=Loading persisted sessions from {0}
standardManager.loading.exception=Exception while loading persisted sessions
standardManager.unloading=Saving persisted sessions to {0}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1726195&r1=1726194&r2=1726195&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Fri
Jan 22 12:30:37 2016
@@ -39,6 +39,7 @@ import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
+import org.apache.catalina.LifecycleState;
import org.apache.catalina.Manager;
import org.apache.catalina.Session;
import org.apache.catalina.SessionIdGenerator;
@@ -264,22 +265,17 @@ public abstract class ManagerBase extend
@Override
public void setContext(Context context) {
- // De-register from the old Context (if any)
- if (this.context != null) {
- this.context.removePropertyChangeListener(this);
+ if (this.context == context) {
+ // NO-OP
+ return;
+ }
+ if (!getState().equals(LifecycleState.NEW)) {
+ throw new
IllegalStateException(sm.getString("managerBase.setContextNotNew"));
}
-
Context oldContext = this.context;
this.context = context;
- support.firePropertyChange("context", oldContext, this.context);
// TODO - delete the line below in Tomcat 9 onwards
- support.firePropertyChange("container", oldContext, this.context);
-
- // Register with the new Context (if any)
- if (this.context != null) {
- setMaxInactiveInterval(this.context.getSessionTimeout() * 60);
- this.context.addPropertyChangeListener(this);
- }
+ support.firePropertyChange("context", oldContext, this.context);
}
@@ -570,7 +566,16 @@ public abstract class ManagerBase extend
super.initInternal();
+ if (context == null) {
+ throw new
LifecycleException(sm.getString("managerBase.contextNull"));
+ }
+
+ // Copy current values from Context
+ setMaxInactiveInterval(this.context.getSessionTimeout() * 60);
setDistributable(getContext().getDistributable());
+
+ // Track any further changes in those values
+ this.context.addPropertyChangeListener(this);
}
@Override
@@ -624,6 +629,17 @@ public abstract class ManagerBase extend
@Override
+ protected void destroyInternal() throws LifecycleException {
+ // De-register from the old Context (if any)
+ if (this.context != null) {
+ this.context.removePropertyChangeListener(this);
+ }
+
+ super.destroyInternal();
+ }
+
+
+ @Override
public void add(Session session) {
sessions.put(session.getIdInternal(), session);
int size = getActiveSessions();
@@ -1260,6 +1276,8 @@ public abstract class ManagerBase extend
log.error(sm.getString("managerBase.sessionTimeout",
event.getNewValue()));
}
+ } else if (event.getPropertyName().equals("distributable")) {
+ setDistributable(((Boolean) event.getNewValue()).booleanValue());
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1726195&r1=1726194&r2=1726195&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
Fri Jan 22 12:30:37 2016
@@ -194,9 +194,7 @@ public class StandardManager extends Man
try (FileInputStream fis = new FileInputStream(file.getAbsolutePath());
BufferedInputStream bis = new BufferedInputStream(fis);) {
Context c = getContext();
- if (c != null) {
- loader = c.getLoader();
- }
+ loader = c.getLoader();
if (loader != null) {
classLoader = loader.getClassLoader();
}
@@ -414,17 +412,16 @@ public class StandardManager extends Man
* persistence file, if any.
*/
protected File file() {
- if ((pathname == null) || (pathname.length() == 0))
- return (null);
+ if (pathname == null || pathname.length() == 0) {
+ return null;
+ }
File file = new File(pathname);
if (!file.isAbsolute()) {
Context context = getContext();
- if (context != null) {
- ServletContext servletContext = context.getServletContext();
- File tempdir = (File)
- servletContext.getAttribute(ServletContext.TEMPDIR);
- if (tempdir != null)
- file = new File(tempdir, pathname);
+ ServletContext servletContext = context.getServletContext();
+ File tempdir = (File)
servletContext.getAttribute(ServletContext.TEMPDIR);
+ if (tempdir != null) {
+ file = new File(tempdir, pathname);
}
}
return file;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1726195&r1=1726194&r2=1726195&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
Fri Jan 22 12:30:37 2016
@@ -1145,15 +1145,11 @@ public class StandardSession implements
*/
@Override
public ServletContext getServletContext() {
-
- if (manager == null)
- return (null);
+ if (manager == null) {
+ return null;
+ }
Context context = manager.getContext();
- if (context == null)
- return (null);
- else
- return (context.getServletContext());
-
+ return context.getServletContext();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
