Author: markt
Date: Thu Jan 21 14:40:43 2016
New Revision: 1725963
URL: http://svn.apache.org/viewvc?rev=1725963&view=rev
Log:
No functional change
Port clean-up (to make merging simpler) prior to back-porting functional changes
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/JDBCStore.java
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/StandardSessionFacade.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 21 14:40:43 2016
@@ -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,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-1666387,1666494,1
666496,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,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,168555
6,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,1703024,1703040,1703044,170
3049-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,1720439,1720445,1720448,17204
62,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,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,1724012,1724427,1724433,1724673,1724788,1724900,1725126-1725127,1725150,1725165,1725816,1725851,1725906-1725907,1725910,1725920,1725926
+/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,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-1666387,1666494,1
666496,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,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,168555
6,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,1703024,1703040,1703044,170
3049-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,1720439,1720445,1720448,17204
62,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,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,1724012,1724427,1724433,1724673,1724788,1724900,1725126-1725127,1725150,1725165,1725816,1725851,1725906-1725907,1725910,1725920,1725926
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=1725963&r1=1725962&r2=1725963&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 Thu
Jan 21 14:40:43 2016
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.session;
-
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -37,7 +34,6 @@ import org.apache.catalina.Loader;
import org.apache.catalina.Session;
import org.apache.catalina.util.CustomObjectInputStream;
-
/**
* Concrete implementation of the <b>Store</b> interface that utilizes
* a file per saved Session in a configured directory. Sessions that are
@@ -47,10 +43,8 @@ import org.apache.catalina.util.CustomOb
*/
public final class FileStore extends StoreBase {
-
// ----------------------------------------------------- Constants
-
/**
* The extension to use for serialized session filenames.
*/
@@ -59,7 +53,6 @@ public final class FileStore extends Sto
// ----------------------------------------------------- Instance Variables
-
/**
* The pathname of the directory in which Sessions are stored.
* This may be an absolute pathname, or a relative path that is
@@ -88,14 +81,11 @@ public final class FileStore extends Sto
// ------------------------------------------------------------- Properties
-
/**
- * Return the directory path for this Store.
+ * @return The directory path for this Store.
*/
public String getDirectory() {
-
- return (directory);
-
+ return directory;
}
@@ -105,21 +95,18 @@ public final class FileStore extends Sto
* @param path The new directory path
*/
public void setDirectory(String path) {
-
String oldDirectory = this.directory;
this.directory = path;
this.directoryFile = null;
- support.firePropertyChange("directory", oldDirectory,
- this.directory);
-
+ support.firePropertyChange("directory", oldDirectory, this.directory);
}
/**
- * Return the thread name for this Store.
+ * @return The thread name for this Store.
*/
public String getThreadName() {
- return(threadName);
+ return threadName;
}
@@ -128,7 +115,7 @@ public final class FileStore extends Sto
*/
@Override
public String getStoreName() {
- return(storeName);
+ return storeName;
}
@@ -139,7 +126,6 @@ public final class FileStore extends Sto
*/
@Override
public int getSize() throws IOException {
-
// Acquire the list of files in our storage directory
File file = directory();
if (file == null) {
@@ -157,27 +143,22 @@ public final class FileStore extends Sto
}
}
return keycount;
-
}
// --------------------------------------------------------- Public Methods
-
/**
* Remove all of the Sessions in this Store.
*
* @exception IOException if an input/output error occurs
*/
@Override
- public void clear()
- throws IOException {
-
+ public void clear() throws IOException {
String[] keys = keys();
for (int i = 0; i < keys.length; i++) {
remove(keys[i]);
}
-
}
@@ -190,7 +171,6 @@ public final class FileStore extends Sto
*/
@Override
public String[] keys() throws IOException {
-
// Acquire the list of files in our storage directory
File file = directory();
if (file == null) {
@@ -213,7 +193,6 @@ public final class FileStore extends Sto
}
}
return list.toArray(new String[list.size()]);
-
}
@@ -228,17 +207,15 @@ public final class FileStore extends Sto
* @exception IOException if an input/output error occurs
*/
@Override
- public Session load(String id)
- throws ClassNotFoundException, IOException {
-
+ public Session load(String id) throws ClassNotFoundException, IOException {
// Open an input stream to the specified pathname, if any
File file = file(id);
if (file == null) {
- return (null);
+ return null;
}
- if (! file.exists()) {
- return (null);
+ if (!file.exists()) {
+ return null;
}
if (manager.getContext().getLogger().isDebugEnabled()) {
manager.getContext().getLogger().debug(sm.getString(getStoreName()+".loading",
@@ -252,10 +229,12 @@ public final class FileStore extends Sto
try (FileInputStream fis = new FileInputStream(file.getAbsolutePath());
BufferedInputStream bis = new BufferedInputStream(fis)) {
Context context = manager.getContext();
- if (context != null)
+ if (context != null) {
loader = context.getLoader();
- if (loader != null)
+ }
+ if (loader != null) {
classLoader = loader.getClassLoader();
+ }
if (classLoader != null) {
Thread.currentThread().setContextClassLoader(classLoader);
ois = new CustomObjectInputStream(bis, classLoader);
@@ -263,15 +242,15 @@ public final class FileStore extends Sto
ois = new ObjectInputStream(bis);
}
- StandardSession session =
- (StandardSession) manager.createEmptySession();
+ StandardSession session = (StandardSession)
manager.createEmptySession();
session.readObjectData(ois);
session.setManager(manager);
- return (session);
+ return session;
} catch (FileNotFoundException e) {
- if (manager.getContext().getLogger().isDebugEnabled())
+ if (manager.getContext().getLogger().isDebugEnabled()) {
manager.getContext().getLogger().debug("No persisted data file
found");
- return (null);
+ }
+ return null;
} finally {
if (ois != null) {
// Close the input stream
@@ -297,17 +276,15 @@ public final class FileStore extends Sto
*/
@Override
public void remove(String id) throws IOException {
-
File file = file(id);
if (file == null) {
return;
}
if (manager.getContext().getLogger().isDebugEnabled()) {
-
manager.getContext().getLogger().debug(sm.getString(getStoreName()+".removing",
+ manager.getContext().getLogger().debug(sm.getString(getStoreName()
+ ".removing",
id, file.getAbsolutePath()));
}
file.delete();
-
}
@@ -321,14 +298,13 @@ public final class FileStore extends Sto
*/
@Override
public void save(Session session) throws IOException {
-
// Open an output stream to the specified pathname, if any
File file = file(session.getIdInternal());
if (file == null) {
return;
}
if (manager.getContext().getLogger().isDebugEnabled()) {
-
manager.getContext().getLogger().debug(sm.getString(getStoreName()+".saving",
+ manager.getContext().getLogger().debug(sm.getString(getStoreName()
+ ".saving",
session.getIdInternal(), file.getAbsolutePath()));
}
@@ -341,20 +317,18 @@ public final class FileStore extends Sto
// -------------------------------------------------------- Private Methods
-
/**
* Return a File object representing the pathname to our
* session persistence directory, if any. The directory will be
* created if it does not already exist.
*/
private File directory() throws IOException {
-
if (this.directory == null) {
- return (null);
+ return null;
}
if (this.directoryFile != null) {
// NOTE: Race condition is harmless, so do not synchronize
- return (this.directoryFile);
+ return this.directoryFile;
}
File file = new File(this.directory);
if (!file.isAbsolute()) {
@@ -365,8 +339,7 @@ public final class FileStore extends Sto
servletContext.getAttribute(ServletContext.TEMPDIR);
file = new File(work, this.directory);
} else {
- throw new IllegalArgumentException
- ("Parent Container is not a Context");
+ throw new IllegalArgumentException("Parent Container is not a
Context");
}
}
if (!file.exists() || !file.isDirectory()) {
@@ -380,8 +353,7 @@ public final class FileStore extends Sto
}
}
this.directoryFile = file;
- return (file);
-
+ return file;
}
@@ -393,15 +365,11 @@ public final class FileStore extends Sto
* used in the file naming.
*/
private File file(String id) throws IOException {
-
if (this.directory == null) {
- return (null);
+ return null;
}
String filename = id + FILE_EXT;
File file = new File(directory(), filename);
- return (file);
-
+ return file;
}
-
-
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/JDBCStore.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=1725963&r1=1725962&r2=1725963&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/JDBCStore.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/JDBCStore.java Thu
Jan 21 14:40:43 2016
@@ -111,7 +111,8 @@ public class JDBCStore extends StoreBase
*/
protected DataSource dataSource = null;
- // ------------------------------------------------------------- Table &
cols
+
+ // ------------------------------------------------------------ Table &
cols
/**
* Table to use.
@@ -148,7 +149,8 @@ public class JDBCStore extends StoreBase
*/
protected String sessionLastAccessedCol = "lastaccess";
- // ------------------------------------------------------------- SQL
Variables
+
+ // ----------------------------------------------------------- SQL
Variables
/**
* Variable to hold the <code>getSize()</code> prepared statement.
@@ -175,7 +177,8 @@ public class JDBCStore extends StoreBase
*/
protected PreparedStatement preparedLoadSql = null;
- // ------------------------------------------------------------- Properties
+
+ // --------------------------------------------------------------
Properties
/**
* @return the name for this instance (built from container name)
@@ -235,7 +238,7 @@ public class JDBCStore extends StoreBase
* @return the driver for this Store.
*/
public String getDriverName() {
- return this.driverName;
+ return driverName;
}
/**
@@ -287,7 +290,7 @@ public class JDBCStore extends StoreBase
* @return the Connection URL for this Store.
*/
public String getConnectionURL() {
- return this.connectionURL;
+ return connectionURL;
}
/**
@@ -307,7 +310,7 @@ public class JDBCStore extends StoreBase
* @return the table for this Store.
*/
public String getSessionTable() {
- return this.sessionTable;
+ return sessionTable;
}
/**
@@ -451,6 +454,7 @@ public class JDBCStore extends StoreBase
return this.dataSourceName;
}
+
// --------------------------------------------------------- Public Methods
@Override
@@ -841,6 +845,7 @@ public class JDBCStore extends StoreBase
}
}
+
// --------------------------------------------------------- Protected
Methods
/**
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=1725963&r1=1725962&r2=1725963&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 Thu
Jan 21 14:40:43 2016
@@ -260,7 +260,8 @@ public abstract class ManagerBase extend
}
- /** Returns the name of the implementation class.
+ /**
+ * @return The name of the implementation class.
*/
public String getClassName() {
return this.getClass().getName();
@@ -403,7 +404,7 @@ public abstract class ManagerBase extend
/**
- * Return the descriptive short name of this Manager implementation.
+ * @return The descriptive short name of this Manager implementation.
*/
public String getName() {
@@ -412,7 +413,7 @@ public abstract class ManagerBase extend
}
/**
- * Return the secure random number generator class name.
+ * @return The secure random number generator class name.
*/
public String getSecureRandomClass() {
@@ -438,7 +439,7 @@ public abstract class ManagerBase extend
/**
- * Return the secure random number generator algorithm name.
+ * @return The secure random number generator algorithm name.
*/
public String getSecureRandomAlgorithm() {
return secureRandomAlgorithm;
@@ -457,7 +458,7 @@ public abstract class ManagerBase extend
/**
- * Return the secure random number generator provider name.
+ * @return The secure random number generator provider name.
*/
public String getSecureRandomProvider() {
return secureRandomProvider;
@@ -516,7 +517,7 @@ public abstract class ManagerBase extend
}
/**
- * Return the frequency of manager checks.
+ * @return The frequency of manager checks.
*/
public int getProcessExpiresFrequency() {
@@ -977,8 +978,8 @@ public abstract class ManagerBase extend
/**
- * Return the maximum number of active Sessions allowed, or -1 for
- * no limit.
+ * @return The maximum number of active Sessions allowed, or -1 for no
+ * limit.
*/
public int getMaxActiveSessions() {
@@ -1173,11 +1174,12 @@ public abstract class ManagerBase extend
/**
- * For debugging: return a list of all session ids currently active
+ * For debugging.
*
+ * @return A space separated list of all session IDs currently active
*/
public String listSessionIds() {
- StringBuilder sb=new StringBuilder();
+ StringBuilder sb = new StringBuilder();
Iterator<String> keys = sessions.keySet().iterator();
while (keys.hasNext()) {
sb.append(keys.next()).append(" ");
@@ -1187,11 +1189,13 @@ public abstract class ManagerBase extend
/**
- * For debugging: get a session attribute
+ * For debugging.
+ *
+ * @param sessionId The ID for the session of interest
+ * @param key The key for the attribute to obtain
*
- * @param sessionId
- * @param key
- * @return The attribute value, if found, null otherwise
+ * @return The attribute value for the specified session, if found, null
+ * otherwise
*/
public String getSessionAttribute( String sessionId, String key ) {
Session s = sessions.get(sessionId);
@@ -1384,15 +1388,16 @@ public abstract class ManagerBase extend
}
/**
- * Time stamp associated with this piece of timing information in
- * milliseconds.
+ * @return Time stamp associated with this piece of timing information
+ * in milliseconds.
*/
public long getTimestamp() {
return timestamp;
}
/**
- * Duration associated with this piece of timing information in
seconds.
+ * @return Duration associated with this piece of timing information in
+ * seconds.
*/
public int getDuration() {
return duration;
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=1725963&r1=1725962&r2=1725963&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
Thu Jan 21 14:40:43 2016
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.session;
import java.io.BufferedInputStream;
@@ -45,6 +43,7 @@ import org.apache.catalina.util.CustomOb
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
+
/**
* Standard implementation of the <b>Manager</b> interface that provides
* simple session persistence across restarts of this component (such as
@@ -62,6 +61,7 @@ public class StandardManager extends Man
private final Log log = LogFactory.getLog(StandardManager.class); // must
not be static
// ---------------------------------------------------- Security Classes
+
private class PrivilegedDoLoad
implements PrivilegedExceptionAction<Void> {
@@ -118,19 +118,15 @@ public class StandardManager extends Man
*/
@Override
public String getName() {
-
- return (name);
-
+ return name;
}
/**
- * Return the session persistence pathname, if any.
+ * @return The session persistence pathname, if any.
*/
public String getPathname() {
-
- return (this.pathname);
-
+ return pathname;
}
@@ -141,11 +137,9 @@ public class StandardManager extends Man
* @param pathname New session persistence pathname
*/
public void setPathname(String pathname) {
-
String oldPathname = this.pathname;
this.pathname = pathname;
support.firePropertyChange("pathname", oldPathname, this.pathname);
-
}
@@ -167,14 +161,14 @@ public class StandardManager extends Man
AccessController.doPrivileged( new PrivilegedDoLoad() );
} catch (PrivilegedActionException ex){
Exception exception = ex.getException();
- if (exception instanceof ClassNotFoundException){
+ if (exception instanceof ClassNotFoundException) {
throw (ClassNotFoundException)exception;
- } else if (exception instanceof IOException){
+ } else if (exception instanceof IOException) {
throw (IOException)exception;
}
- if (log.isDebugEnabled())
- log.debug("Unreported exception in load() "
- + exception);
+ if (log.isDebugEnabled()) {
+ log.debug("Unreported exception in load() ", exception);
+ }
}
} else {
doLoad();
@@ -192,18 +186,21 @@ public class StandardManager extends Man
* @exception IOException if an input/output error occurs
*/
protected void doLoad() throws ClassNotFoundException, IOException {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Start: Loading persisted sessions");
+ }
// Initialize our internal data structures
sessions.clear();
// Open an input stream to the specified pathname, if any
File file = file();
- if (file == null)
+ if (file == null) {
return;
- if (log.isDebugEnabled())
+ }
+ if (log.isDebugEnabled()) {
log.debug(sm.getString("standardManager.loading", pathname));
+ }
FileInputStream fis = null;
BufferedInputStream bis = null;
ObjectInputStream ois = null;
@@ -213,22 +210,27 @@ public class StandardManager extends Man
fis = new FileInputStream(file.getAbsolutePath());
bis = new BufferedInputStream(fis);
Context c = getContext();
- if (c != null)
+ if (c != null) {
loader = c.getLoader();
- if (loader != null)
+ }
+ if (loader != null) {
classLoader = loader.getClassLoader();
+ }
if (classLoader != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Creating custom object input stream for class
loader ");
+ }
ois = new CustomObjectInputStream(bis, classLoader);
} else {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Creating standard object input stream");
+ }
ois = new ObjectInputStream(bis);
}
} catch (FileNotFoundException e) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("No persisted data file found");
+ }
return;
} catch (IOException e) {
log.error(sm.getString("standardManager.loading.ioe", e), e);
@@ -285,13 +287,15 @@ public class StandardManager extends Man
}
// Delete the persistent storage file
- if (file.exists() )
+ if (file.exists()) {
file.delete();
+ }
}
}
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Finish: Loading persisted sessions");
+ }
}
@@ -304,17 +308,17 @@ public class StandardManager extends Man
*/
@Override
public void unload() throws IOException {
- if (SecurityUtil.isPackageProtectionEnabled()){
- try{
- AccessController.doPrivileged( new PrivilegedDoUnload() );
+ if (SecurityUtil.isPackageProtectionEnabled()) {
+ try {
+ AccessController.doPrivileged(new PrivilegedDoUnload());
} catch (PrivilegedActionException ex){
Exception exception = ex.getException();
- if (exception instanceof IOException){
+ if (exception instanceof IOException) {
throw (IOException)exception;
}
- if (log.isDebugEnabled())
- log.debug("Unreported exception in unLoad() "
- + exception);
+ if (log.isDebugEnabled()) {
+ log.debug("Unreported exception in unLoad()", exception);
+ }
}
} else {
doUnload();
@@ -342,10 +346,12 @@ public class StandardManager extends Man
// Open an output stream to the specified pathname, if any
File file = file();
- if (file == null)
+ if (file == null) {
return;
- if (log.isDebugEnabled())
+ }
+ if (log.isDebugEnabled()) {
log.debug(sm.getString("standardManager.unloading", pathname));
+ }
FileOutputStream fos = null;
BufferedOutputStream bos = null;
ObjectOutputStream oos = null;
@@ -387,8 +393,9 @@ public class StandardManager extends Man
// Write the number of active sessions, followed by the details
ArrayList<StandardSession> list = new ArrayList<>();
synchronized (sessions) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Unloading " + sessions.size() + " sessions");
+ }
try {
// oos can't be null here
oos.writeObject(Integer.valueOf(sessions.size()));
@@ -423,8 +430,9 @@ public class StandardManager extends Man
}
// Expire all the sessions we just wrote
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Expiring " + list.size() + " persisted sessions");
+ }
Iterator<StandardSession> expires = list.iterator();
while (expires.hasNext()) {
StandardSession session = expires.next();
@@ -437,9 +445,9 @@ public class StandardManager extends Man
}
}
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Unloading complete");
-
+ }
}
@@ -477,8 +485,9 @@ public class StandardManager extends Man
@Override
protected synchronized void stopInternal() throws LifecycleException {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Stopping");
+ }
setState(LifecycleState.STOPPING);
@@ -514,13 +523,11 @@ public class StandardManager extends Man
// ------------------------------------------------------ Protected Methods
-
/**
* Return a File object representing the pathname to our
* persistence file, if any.
*/
protected File file() {
-
if ((pathname == null) || (pathname.length() == 0))
return (null);
File file = new File(pathname);
@@ -536,7 +543,6 @@ public class StandardManager extends Man
}
// if (!file.isAbsolute())
// return (null);
- return (file);
-
+ return file;
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSessionFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSessionFacade.java?rev=1725963&r1=1725962&r2=1725963&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSessionFacade.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/StandardSessionFacade.java
Thu Jan 21 14:40:43 2016
@@ -14,17 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.session;
-
import java.util.Enumeration;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
-
/**
* Facade for the StandardSession object.
*
@@ -32,11 +28,12 @@ import javax.servlet.http.HttpSession;
*/
public class StandardSessionFacade implements HttpSession {
-
// ----------------------------------------------------------- Constructors
/**
* Construct a new session facade.
+ *
+ * @param session The session instance to wrap
*/
public StandardSessionFacade(HttpSession session) {
this.session = session;
@@ -45,7 +42,6 @@ public class StandardSessionFacade imple
// ----------------------------------------------------- Instance Variables
-
/**
* Wrapped session object.
*/
@@ -54,7 +50,6 @@ public class StandardSessionFacade imple
// ---------------------------------------------------- HttpSession Methods
-
@Override
public long getCreationTime() {
return session.getCreationTime();
@@ -181,6 +176,4 @@ public class StandardSessionFacade imple
public boolean isNew() {
return session.isNew();
}
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
