Author: markt
Date: Fri Jan 22 11:14:16 2016
New Revision: 1726173
URL: http://svn.apache.org/viewvc?rev=1726173&view=rev
Log:
Review Javadoc for Manager hierarchy. Remove unnecessary duplication.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/ClusterManager.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManager.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 22 11:14:16 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,1725126-1725127,1725150,1725165,1725816,1725851,1725906-1725907,1725910,1725920,1725926
+/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,1725126-1725127,1725150,1725165,1725816,1725851,1725906-1725907,1725910,1725920,1725926
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/ClusterManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/ClusterManager.java?rev=1726173&r1=1726172&r2=1726173&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/ClusterManager.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/ClusterManager.java Fri
Jan 22 11:14:16 2016
@@ -79,6 +79,14 @@ public interface ClusterManager extends
public void setCluster(CatalinaCluster cluster);
+ /**
+ * Open stream and use correct ClassLoader (Container), switching thread
+ * context class loader.
+ *
+ * @param data The data
+ * @return The object input stream
+ * @throws IOException An error occurred
+ */
public ReplicationStream getReplicationStream(byte[] data) throws
IOException;
public ReplicationStream getReplicationStream(byte[] data, int offset, int
length) throws IOException;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1726173&r1=1726172&r2=1726173&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Fri Jan 22 11:14:16 2016
@@ -72,9 +72,6 @@ public abstract class ClusterManagerBase
*/
private boolean recordAllActions = false;
- /*
- * @see org.apache.catalina.ha.ClusterManager#getCluster()
- */
@Override
public CatalinaCluster getCluster() {
return cluster;
@@ -178,14 +175,6 @@ public abstract class ClusterManagerBase
return getClassLoaders(getContext());
}
- /**
- * Open Stream and use correct ClassLoader (Container) Switch
- * ThreadClassLoader
- *
- * @param data
- * @return The object input stream
- * @throws IOException
- */
@Override
public ReplicationStream getReplicationStream(byte[] data) throws
IOException {
return getReplicationStream(data,0,data.length);
@@ -209,6 +198,10 @@ public abstract class ClusterManagerBase
// NOOP
}
+ /**
+ * {@link org.apache.catalina.Manager} implementations that also implement
+ * {@link ClusterManager} do not support local session persistence.
+ */
@Override
public void unload() {
// NOOP
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1726173&r1=1726172&r2=1726173&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Fri Jan 22 11:14:16 2016
@@ -127,9 +127,6 @@ public class DeltaManager extends Cluste
this.name = name;
}
- /**
- * Return the descriptive short name of this Manager implementation.
- */
@Override
public String getName() {
return name;
@@ -409,34 +406,16 @@ public class DeltaManager extends Cluste
this.notifyContainerListenersOnReplication =
notifyContainerListenersOnReplication;
}
+
// --------------------------------------------------------- Public Methods
- /**
- * Construct and return a new session object, based on the default settings
- * specified by this Manager's properties. The session id will be assigned
- * by this method, and available via the getId() method of the returned
- * session. If a new session cannot be created for any reason, return
- * <code>null</code>.
- *
- * @exception IllegalStateException
- * if a new session cannot be instantiated for any reason
- *
- * Construct and return a new session object, based on the default settings
- * specified by this Manager's properties. The session id will be assigned
- * by this method, and available via the getId() method of the returned
- * session. If a new session cannot be created for any reason, return
- * <code>null</code>.
- *
- * @exception IllegalStateException
- * if a new session cannot be instantiated for any reason
- */
@Override
public Session createSession(String sessionId) {
return createSession(sessionId, true);
}
/**
- * create new session with check maxActiveSessions and send session
creation
+ * Create new session with check maxActiveSessions and send session
creation
* to other cluster nodes.
*
* @param distribute
@@ -486,8 +465,9 @@ public class DeltaManager extends Cluste
}
/**
- * Create DeltaSession
- * @see org.apache.catalina.Manager#createEmptySession()
+ * {@inheritDoc}
+ * <p>
+ * Creates new DeltaSession instance.
*/
@Override
public Session createEmptySession() {
@@ -501,23 +481,11 @@ public class DeltaManager extends Cluste
return new DeltaSession(this);
}
- /**
- * Change the session ID of the current session to a new randomly generated
- * session ID.
- *
- * @param session The session to change the session ID for
- */
@Override
public void changeSessionId(Session session) {
changeSessionId(session, true);
}
- /**
- * Change the session ID of the current session to a specified session ID.
- *
- * @param session The session to change the session ID for
- * @param newId new session ID
- */
@Override
public void changeSessionId(Session session, String newId) {
changeSessionId(session, newId, true);
@@ -1157,13 +1125,6 @@ public class DeltaManager extends Cluste
}
- /**
- * When the manager expires session not tied to a request. The cluster will
- * periodically ask for a list of sessions that should expire and that
- * should be sent across the wire.
- *
- * @return The invalidated sessions array
- */
@Override
public String[] getInvalidatedSessions() {
return new String[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=1726173&r1=1726172&r2=1726173&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 11:14:16 2016
@@ -267,25 +267,12 @@ public abstract class ManagerBase extend
}
- /**
- * Return the distributable flag for the sessions supported by
- * this Manager.
- */
@Override
public boolean getDistributable() {
-
- return (this.distributable);
-
+ return this.distributable;
}
- /**
- * Set the distributable flag for the sessions supported by this
- * Manager. If this flag is set, all user data objects added to
- * sessions associated with this manager must implement Serializable.
- *
- * @param distributable The new distributable flag
- */
@Override
public void setDistributable(boolean distributable) {
@@ -297,33 +284,19 @@ public abstract class ManagerBase extend
}
- /**
- * Return the default maximum inactive interval (in seconds)
- * for Sessions created by this Manager.
- */
@Override
public int getMaxInactiveInterval() {
-
- return (this.maxInactiveInterval);
-
+ return this.maxInactiveInterval;
}
- /**
- * Set the default maximum inactive interval (in seconds)
- * for Sessions created by this Manager.
- *
- * @param interval The new default value
- */
@Override
public void setMaxInactiveInterval(int interval) {
-
int oldMaxInactiveInterval = this.maxInactiveInterval;
this.maxInactiveInterval = interval;
support.firePropertyChange("maxInactiveInterval",
Integer.valueOf(oldMaxInactiveInterval),
Integer.valueOf(this.maxInactiveInterval));
-
}
@@ -390,11 +363,6 @@ public abstract class ManagerBase extend
}
- /**
- * Sets the session id generator
- *
- * @param sessionIdGenerator The session id generator
- */
@Override
public void setSessionIdGenerator(SessionIdGenerator sessionIdGenerator) {
this.sessionIdGenerator = sessionIdGenerator;
@@ -475,32 +443,18 @@ public abstract class ManagerBase extend
}
- /**
- * Number of session creations that failed due to maxActiveSessions
- *
- * @return The count
- */
@Override
public int getRejectedSessions() {
return rejectedSessions;
}
- /**
- * Gets the number of sessions that have expired.
- *
- * @return Number of sessions that have expired
- */
+
@Override
public long getExpiredSessions() {
return expiredSessions.get();
}
- /**
- * Sets the number of sessions that have expired.
- *
- * @param expiredSessions Number of sessions that have expired
- */
@Override
public void setExpiredSessions(long expiredSessions) {
this.expiredSessions.set(expiredSessions);
@@ -546,7 +500,9 @@ public abstract class ManagerBase extend
/**
- * Implements the Manager interface, direct call to processExpires
+ * {@inheritDoc}
+ * <p>
+ * Direct call to {@link #processExpires()}
*/
@Override
public void backgroundProcess() {
@@ -636,14 +592,8 @@ public abstract class ManagerBase extend
}
- /**
- * Add this Session to the set of active Sessions for this Manager.
- *
- * @param session Session to be added
- */
@Override
public void add(Session session) {
-
sessions.put(session.getIdInternal(), session);
int size = getActiveSessions();
if( size > maxActive ) {
@@ -656,32 +606,12 @@ public abstract class ManagerBase extend
}
- /**
- * Add a property change listener to this component.
- *
- * @param listener The listener to add
- */
@Override
public void addPropertyChangeListener(PropertyChangeListener listener) {
-
support.addPropertyChangeListener(listener);
-
}
- /**
- * Construct and return a new session object, based on the default
- * settings specified by this Manager's properties. The session
- * id specified will be used as the session id.
- * If a new session cannot be created for any reason, return
- * <code>null</code>.
- *
- * @param sessionId The session id which should be used to create the
- * new session; if <code>null</code>, a new session id will be
- * generated
- * @exception IllegalStateException if a new session cannot be
- * instantiated for any reason
- */
@Override
public Session createSession(String sessionId) {
@@ -718,69 +648,35 @@ public abstract class ManagerBase extend
}
- /**
- * Get a session from the recycled ones or create a new empty one.
- * The PersistentManager manager does not need to create session data
- * because it reads it from the Store.
- */
@Override
public Session createEmptySession() {
return (getNewSession());
}
- /**
- * Return the active Session, associated with this Manager, with the
- * specified session id (if any); otherwise return <code>null</code>.
- *
- * @param id The session id for the session to be returned
- *
- * @exception IllegalStateException if a new session cannot be
- * instantiated for any reason
- * @exception IOException if an input/output error occurs while
- * processing this request
- */
@Override
public Session findSession(String id) throws IOException {
-
- if (id == null)
- return (null);
+ if (id == null) {
+ return null;
+ }
return sessions.get(id);
-
}
- /**
- * Return the set of active Sessions associated with this Manager.
- * If this Manager has no active Sessions, a zero-length array is returned.
- */
@Override
public Session[] findSessions() {
-
return sessions.values().toArray(new Session[0]);
-
}
- /**
- * Remove this Session from the active Sessions for this Manager.
- *
- * @param session Session to be removed
- */
@Override
public void remove(Session session) {
remove(session, false);
}
- /**
- * Remove this Session from the active Sessions for this Manager.
- *
- * @param session Session to be removed
- * @param update Should the expiration statistics be updated
- */
+
@Override
public void remove(Session session, boolean update) {
-
// If the session has expired - as opposed to just being removed from
// the manager because it is being persisted - update the expired stats
if (update) {
@@ -802,42 +698,25 @@ public abstract class ManagerBase extend
}
- /**
- * Remove a property change listener from this component.
- *
- * @param listener The listener to remove
- */
@Override
public void removePropertyChangeListener(PropertyChangeListener listener) {
-
support.removePropertyChangeListener(listener);
-
}
- /**
- * Change the session ID of the current session to a new randomly generated
- * session ID.
- *
- * @param session The session to change the session ID for
- */
@Override
public void changeSessionId(Session session) {
String newId = generateSessionId();
changeSessionId(session, newId, true, true);
}
- /**
- * Change the session ID of the current session to a specified session ID.
- *
- * @param session The session to change the session ID for
- * @param newId new session ID
- */
+
@Override
public void changeSessionId(Session session, String newId) {
changeSessionId(session, newId, true, true);
}
+
protected void changeSessionId(Session session, String newId,
boolean notifySessionListeners, boolean notifyContainerListeners) {
String oldId = session.getIdInternal();
@@ -930,11 +809,6 @@ public abstract class ManagerBase extend
}
- /**
- * Total sessions created by this manager.
- *
- * @return sessions created
- */
@Override
public long getSessionCounter() {
return sessionCounter;
@@ -957,22 +831,12 @@ public abstract class ManagerBase extend
}
- /**
- * Returns the number of active sessions
- *
- * @return number of sessions active
- */
@Override
public int getActiveSessions() {
return sessions.size();
}
- /**
- * Max number of concurrent active sessions
- *
- * @return The highest number of concurrent active sessions
- */
@Override
public int getMaxActive() {
return maxActive;
@@ -1015,26 +879,12 @@ public abstract class ManagerBase extend
}
- /**
- * Gets the longest time (in seconds) that an expired session had been
- * alive.
- *
- * @return Longest time (in seconds) that an expired session had been
- * alive.
- */
@Override
public int getSessionMaxAliveTime() {
return sessionMaxAliveTime;
}
- /**
- * Sets the longest time (in seconds) that an expired session had been
- * alive. Typically used for resetting the current value.
- *
- * @param sessionMaxAliveTime Longest time (in seconds) that an expired
- * session had been alive.
- */
@Override
public void setSessionMaxAliveTime(int sessionMaxAliveTime) {
synchronized (sessionMaxAliveTimeUpdateLock) {
@@ -1061,12 +911,10 @@ public abstract class ManagerBase extend
}
/**
- * Gets the average time (in seconds) that expired sessions had been
- * alive based on the last 100 sessions to expire. If less than
- * 100 sessions have expired then all available data is used.
- *
- * @return Average time (in seconds) that expired sessions had been
- * alive.
+ * {@inheritDoc}
+ * <p>
+ * Based on the last 100 sessions to expire. If less than 100 sessions have
+ * expired then all available data is used.
*/
@Override
public int getSessionAverageAliveTime() {
@@ -1097,11 +945,9 @@ public abstract class ManagerBase extend
/**
- * Gets the current rate of session creation (in session per minute) based
- * on the creation time of the previous 100 sessions created. If less than
- * 100 sessions have been created then all available data is used.
- *
- * @return The current rate (in sessions per minute) of session creation
+ * {@inheritDoc}<p>
+ * Based on the creation time of the previous 100 sessions created. If less
+ * than 100 sessions have been created then all available data is used.
*/
@Override
public int getSessionCreateRate() {
@@ -1140,9 +986,10 @@ public abstract class ManagerBase extend
/**
- * Gets the current rate of session expiration (in session per minute)
based
- * on the expiry time of the previous 100 sessions expired. If less than
- * 100 sessions have expired then all available data is used.
+ * {@inheritDoc}
+ * <p>
+ * Based on the expiry time of the previous 100 sessions expired. If less
+ * than 100 sessions have expired then all available data is used.
*
* @return The current rate (in sessions per minute) of session expiration
*/
@@ -1318,9 +1165,6 @@ public abstract class ManagerBase extend
}
- /**
- * Return a String rendering of this object.
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder(this.getClass().getName());
@@ -1359,14 +1203,9 @@ public abstract class ManagerBase extend
return context.getDomain();
}
+
// ----------------------------------------- PropertyChangeListener Methods
- /**
- * Process property change events from our associated Context.
- *
- * @param event
- * The property change event that has occurred
- */
@Override
public void propertyChange(PropertyChangeEvent event) {
@@ -1386,6 +1225,7 @@ public abstract class ManagerBase extend
}
}
+
// ----------------------------------------------------------- Inner
classes
protected static final class SessionTiming {
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=1726173&r1=1726172&r2=1726173&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
Fri Jan 22 11:14:16 2016
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.session;
/**
@@ -40,17 +38,14 @@ public final class PersistentManager ext
/**
* The descriptive name of this Manager implementation (for logging).
*/
- static final String name = "PersistentManager";
+ private static final String name = "PersistentManager";
// ------------------------------------------------------------- Properties
- /**
- * Return the descriptive short name of this Manager implementation.
- */
@Override
public String getName() {
- return (name);
+ return name;
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1726173&r1=1726172&r2=1726173&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Fri Jan 22 11:14:16 2016
@@ -314,14 +314,9 @@ public abstract class PersistentManagerB
}
- /**
- * @return the descriptive short name of this Manager implementation.
- */
@Override
public String getName() {
-
return name;
-
}
@@ -334,7 +329,6 @@ public abstract class PersistentManagerB
public void setStore(Store store) {
this.store = store;
store.setManager(this);
-
}
@@ -344,9 +338,7 @@ public abstract class PersistentManagerB
*/
@Override
public Store getStore() {
-
return this.store;
-
}
@@ -418,8 +410,9 @@ public abstract class PersistentManagerB
/**
- * Implements the {@link org.apache.catalina.Manager Manager} interface,
- * direct call to processExpires and processPersistenceChecks
+ * {@inheritDoc}
+ * <p>
+ * Direct call to processExpires and processPersistenceChecks
*/
@Override
public void processExpires() {
@@ -462,17 +455,10 @@ public abstract class PersistentManagerB
/**
- * Return the active Session, associated with this Manager, with the
- * specified session id (if any); otherwise return <code>null</code>.
+ * {@inheritDoc}
+ * <p>
* This method checks the persistence store if persistence is enabled,
* otherwise just uses the functionality from ManagerBase.
- *
- * @param id The session id for the session to be returned
- *
- * @exception IllegalStateException if a new session cannot be
- * instantiated for any reason
- * @exception IOException if an input/output error occurs while
- * processing this request
*/
@Override
public Session findSession(String id) throws IOException {
@@ -501,7 +487,6 @@ public abstract class PersistentManagerB
// See if the Session is in the Store
session = swapIn(id);
return session;
-
}
/**
@@ -572,10 +557,9 @@ public abstract class PersistentManagerB
/**
- * Remove this Session from the active Sessions for this Manager,
- * and from the Store.
- *
- * @param session Session to be removed
+ * {@inheritDoc}
+ * <p>
+ * Remove this Session from the Store.
*/
@Override
public void remove(Session session, boolean update) {
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=1726173&r1=1726172&r2=1726173&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 11:14:16 2016
@@ -113,9 +113,6 @@ public class StandardManager extends Man
// ------------------------------------------------------------- Properties
- /**
- * Return the descriptive short name of this Manager implementation.
- */
@Override
public String getName() {
return name;
@@ -145,15 +142,6 @@ public class StandardManager extends Man
// --------------------------------------------------------- Public Methods
- /**
- * Load any currently active sessions that were previously unloaded
- * to the appropriate persistence mechanism, if any. If persistence is not
- * supported, this method returns without doing anything.
- *
- * @exception ClassNotFoundException if a serialized class cannot be
- * found during the reload
- * @exception IOException if an input/output error occurs
- */
@Override
public void load() throws ClassNotFoundException, IOException {
if (SecurityUtil.isPackageProtectionEnabled()){
@@ -257,13 +245,6 @@ public class StandardManager extends Man
}
- /**
- * Save any currently active sessions in the appropriate persistence
- * mechanism, if any. If persistence is not supported, this method
- * returns without doing anything.
- *
- * @exception IOException if an input/output error occurs
- */
@Override
public void unload() throws IOException {
if (SecurityUtil.isPackageProtectionEnabled()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
