Author: markt Date: Thu Jan 7 10:12:08 2016 New Revision: 1723504 URL: http://svn.apache.org/viewvc?rev=1723504&view=rev Log: MessageDispatch15Interceptor was used to add Java 5 features to MessageDispatchInterceptor. Since the minimum Java version is now >=5 (and has been since Tomcat 6) there is no need for the separate implementation. Merge the Java 5 features into MessageDispatchInterceptor and deprecate MessageDispatch15Interceptor and associated now unused code
Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java Propchange: tomcat/tc8.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 7 10:12:08 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,1723316-1723318,1723437,1723484,1723486,1723500 +/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,1723316-1723318,1723368,1723371,1723375,1723377,1723380,1723437,1723484,1723486,1723500 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=1723504&r1=1723503&r2=1723504&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 Thu Jan 7 10:12:08 2016 @@ -52,7 +52,7 @@ import org.apache.catalina.tribes.Channe import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.MembershipListener; import org.apache.catalina.tribes.group.GroupChannel; -import org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor; +import org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor; import org.apache.catalina.tribes.group.interceptors.TcpFailureDetector; import org.apache.catalina.util.LifecycleMBeanBase; import org.apache.juli.logging.Log; @@ -564,7 +564,7 @@ public class SimpleTcpCluster extends Li if ( clusterDeployer != null ) clusterDeployer.setCluster(this); if ( channel == null ) channel = new GroupChannel(); if ( channel instanceof GroupChannel && !((GroupChannel)channel).getInterceptors().hasNext()) { - channel.addInterceptor(new MessageDispatch15Interceptor()); + channel.addInterceptor(new MessageDispatchInterceptor()); channel.addInterceptor(new TcpFailureDetector()); } if (heartbeatBackgroundEnabled) channel.setHeartbeat(false); Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1723504&r1=1723503&r2=1723504&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Thu Jan 7 10:12:08 2016 @@ -38,7 +38,7 @@ import org.apache.catalina.tribes.Member import org.apache.catalina.tribes.MembershipService; import org.apache.catalina.tribes.RemoteProcessException; import org.apache.catalina.tribes.UniqueId; -import org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor; +import org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor; import org.apache.catalina.tribes.io.BufferPool; import org.apache.catalina.tribes.io.ChannelData; import org.apache.catalina.tribes.io.XByteBuffer; @@ -373,7 +373,7 @@ public class GroupChannel extends Channe protected synchronized void setupDefaultStack() throws ChannelException { if (getFirstInterceptor() != null && ((getFirstInterceptor().getNext() instanceof ChannelCoordinator))) { - addInterceptor(new MessageDispatch15Interceptor()); + addInterceptor(new MessageDispatchInterceptor()); } } Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java?rev=1723504&r1=1723503&r2=1723504&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java Thu Jan 7 10:12:08 2016 @@ -16,106 +16,13 @@ */ package org.apache.catalina.tribes.group.interceptors; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; - -import org.apache.catalina.tribes.ChannelMessage; -import org.apache.catalina.tribes.Member; -import org.apache.catalina.tribes.group.InterceptorPayload; -import org.apache.catalina.tribes.transport.bio.util.LinkObject; -import org.apache.catalina.tribes.util.ExecutorFactory; -import org.apache.catalina.tribes.util.TcclThreadFactory; - /** - * - * Same implementation as the MessageDispatchInterceptor - * except it uses an atomic long for the currentSize calculation - * and uses a thread pool for message sending. - * - * @version 1.0 + * @deprecated Originally provided an optional implementation that used Java 5+ + * features. Now the minimum Java version is >=5, those features + * have been added to {@link MessageDispatchInterceptor} which + * should be used instead. This class will be removed in Tomcat + * 9.0.x onwards. */ - +@Deprecated public class MessageDispatch15Interceptor extends MessageDispatchInterceptor { - - protected final AtomicLong currentSize = new AtomicLong(0); - protected ExecutorService executor = null; - protected int maxThreads = 10; - protected int maxSpareThreads = 2; - protected long keepAliveTime = 5000; - - @Override - public long getCurrentSize() { - return currentSize.get(); - } - - @Override - public long addAndGetCurrentSize(long inc) { - return currentSize.addAndGet(inc); - } - - @Override - public long setAndGetCurrentSize(long value) { - currentSize.set(value); - return value; - } - - @Override - public boolean addToQueue(ChannelMessage msg, Member[] destination, InterceptorPayload payload) { - final LinkObject obj = new LinkObject(msg,destination,payload); - Runnable r = new Runnable() { - @Override - public void run() { - sendAsyncData(obj); - } - }; - executor.execute(r); - return true; - } - - @Override - public LinkObject removeFromQueue() { - return null; //not used, thread pool contains its own queue. - } - - @Override - public void startQueue() { - if ( run ) return; - executor = ExecutorFactory.newThreadPool(maxSpareThreads, maxThreads, - keepAliveTime, TimeUnit.MILLISECONDS, - new TcclThreadFactory("MessageDispatch15Interceptor.MessageDispatchThread")); - run = true; - } - - @Override - public void stopQueue() { - run = false; - executor.shutdownNow(); - setAndGetCurrentSize(0); - } - - public long getKeepAliveTime() { - return keepAliveTime; - } - - public int getMaxSpareThreads() { - return maxSpareThreads; - } - - public int getMaxThreads() { - return maxThreads; - } - - public void setKeepAliveTime(long keepAliveTime) { - this.keepAliveTime = keepAliveTime; - } - - public void setMaxSpareThreads(int maxSpareThreads) { - this.maxSpareThreads = maxSpareThreads; - } - - public void setMaxThreads(int maxThreads) { - this.maxThreads = maxThreads; - } - } \ No newline at end of file Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1723504&r1=1723503&r2=1723504&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java Thu Jan 7 10:12:08 2016 @@ -16,63 +16,85 @@ */ package org.apache.catalina.tribes.group.interceptors; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + import org.apache.catalina.tribes.Channel; import org.apache.catalina.tribes.ChannelException; import org.apache.catalina.tribes.ChannelMessage; +import org.apache.catalina.tribes.ErrorHandler; import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.UniqueId; import org.apache.catalina.tribes.group.ChannelInterceptorBase; import org.apache.catalina.tribes.group.InterceptorPayload; -import org.apache.catalina.tribes.transport.bio.util.FastQueue; -import org.apache.catalina.tribes.transport.bio.util.LinkObject; +import org.apache.catalina.tribes.util.ExecutorFactory; import org.apache.catalina.tribes.util.StringManager; +import org.apache.catalina.tribes.util.TcclThreadFactory; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; /** - * * The message dispatcher is a way to enable asynchronous communication * through a channel. The dispatcher will look for the * <code>Channel.SEND_OPTIONS_ASYNCHRONOUS</code> flag to be set, if it is, it * will queue the message for delivery and immediately return to the sender. - * - * @version 1.0 */ public class MessageDispatchInterceptor extends ChannelInterceptorBase implements Runnable { + private static final Log log = LogFactory.getLog(MessageDispatchInterceptor.class); protected static final StringManager sm = StringManager.getManager(MessageDispatchInterceptor.class.getPackage().getName()); protected long maxQueueSize = 1024*1024*64; //64MB - protected final FastQueue queue = new FastQueue(); + /** + * Deprecated. Unused. Will be removed in Tomcat 9.0.x. + */ + @Deprecated + // Use fully qualified name to avoid deprecation warning on import. + protected final org.apache.catalina.tribes.transport.bio.util.FastQueue queue = + new org.apache.catalina.tribes.transport.bio.util.FastQueue(); protected volatile boolean run = false; + /** + * Deprecated. Unused. Will be removed in Tomcat 9.0.x. + */ + @Deprecated protected Thread msgDispatchThread = null; - protected long currentSize = 0; protected boolean useDeepClone = true; protected boolean alwaysSend = true; + protected final AtomicLong currentSize = new AtomicLong(0); + protected ExecutorService executor = null; + protected int maxThreads = 10; + protected int maxSpareThreads = 2; + protected long keepAliveTime = 5000; + + public MessageDispatchInterceptor() { setOptionFlag(Channel.SEND_OPTIONS_ASYNCHRONOUS); } + @Override public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws ChannelException { boolean async = (msg.getOptions() & Channel.SEND_OPTIONS_ASYNCHRONOUS) == Channel.SEND_OPTIONS_ASYNCHRONOUS; - if ( async && run ) { - if ( (getCurrentSize()+msg.getMessage().getLength()) > maxQueueSize ) { - if ( alwaysSend ) { + if (async && run) { + if ((getCurrentSize()+msg.getMessage().getLength()) > maxQueueSize) { + if (alwaysSend) { super.sendMessage(destination,msg,payload); return; } else { throw new ChannelException(sm.getString("messageDispatchInterceptor.queue.full", Long.toString(maxQueueSize), Long.toString(getCurrentSize()))); - }//end if - }//end if + } + } //add to queue - if ( useDeepClone ) msg = (ChannelMessage)msg.deepclone(); - if (!addToQueue(msg, destination, payload) ) { + if (useDeepClone) { + msg = (ChannelMessage)msg.deepclone(); + } + if (!addToQueue(msg, destination, payload)) { throw new ChannelException( sm.getString("messageDispatchInterceptor.unableAdd.queue")); } @@ -82,29 +104,46 @@ public class MessageDispatchInterceptor } } - public boolean addToQueue(ChannelMessage msg, Member[] destination, - InterceptorPayload payload) { - return queue.add(msg,destination,payload); + + public boolean addToQueue(final ChannelMessage msg, final Member[] destination, + final InterceptorPayload payload) { + Runnable r = new Runnable() { + @Override + public void run() { + sendAsyncData(msg, destination, payload); + } + }; + executor.execute(r); + return true; } - public LinkObject removeFromQueue() { - return queue.remove(); + + /** + * @deprecated. Not used. The thread pool contains its own queue. This will + * be removed in Tomcat 9.0.x onwards. + * + * @return Always null + */ + @Deprecated + public org.apache.catalina.tribes.transport.bio.util.LinkObject removeFromQueue() { + return null; } + public void startQueue() { - msgDispatchThread = new Thread(this); - msgDispatchThread.setName("MessageDispatchInterceptor.MessageDispatchThread"); - msgDispatchThread.setDaemon(true); - msgDispatchThread.setPriority(Thread.MAX_PRIORITY); - queue.setEnabled(true); + if (run) { + return; + } + executor = ExecutorFactory.newThreadPool(maxSpareThreads, maxThreads, keepAliveTime, + TimeUnit.MILLISECONDS, + new TcclThreadFactory("MessageDispatchInterceptor.MessageDispatchThread")); run = true; - msgDispatchThread.start(); } + public void stopQueue() { run = false; - msgDispatchThread.interrupt(); - queue.setEnabled(false); + executor.shutdownNow(); setAndGetCurrentSize(0); } @@ -117,40 +156,82 @@ public class MessageDispatchInterceptor super.setOptionFlag(flag); } + public void setMaxQueueSize(long maxQueueSize) { this.maxQueueSize = maxQueueSize; } + public void setUseDeepClone(boolean useDeepClone) { this.useDeepClone = useDeepClone; } + public long getMaxQueueSize() { return maxQueueSize; } + public boolean getUseDeepClone() { return useDeepClone; } + public long getCurrentSize() { - return currentSize; + return currentSize.get(); } + public long addAndGetCurrentSize(long inc) { - synchronized (this) { - currentSize += inc; - return currentSize; - } + return currentSize.addAndGet(inc); } + public long setAndGetCurrentSize(long value) { - synchronized (this) { - currentSize = value; - return value; - } + currentSize.set(value); + return value; + } + + + public long getKeepAliveTime() { + return keepAliveTime; + } + + + public int getMaxSpareThreads() { + return maxSpareThreads; + } + + public int getMaxThreads() { + return maxThreads; + } + + + public void setKeepAliveTime(long keepAliveTime) { + this.keepAliveTime = keepAliveTime; + } + + + public void setMaxSpareThreads(int maxSpareThreads) { + this.maxSpareThreads = maxSpareThreads; + } + + + public void setMaxThreads(int maxThreads) { + this.maxThreads = maxThreads; + } + + + public boolean isAlwaysSend() { + return alwaysSend; + } + + + public void setAlwaysSend(boolean alwaysSend) { + this.alwaysSend = alwaysSend; } + @Override public void start(int svc) throws ChannelException { //start the thread @@ -159,9 +240,9 @@ public class MessageDispatchInterceptor // only start with the sender if ( !run && ((svc & Channel.SND_TX_SEQ)==Channel.SND_TX_SEQ) ) { startQueue(); - }//end if - }//sync - }//end if + } + } + } super.start(svc); } @@ -169,64 +250,73 @@ public class MessageDispatchInterceptor @Override public void stop(int svc) throws ChannelException { //stop the thread - if ( run ) { + if (run) { synchronized (this) { if ( run && ((svc & Channel.SND_TX_SEQ)==Channel.SND_TX_SEQ)) { stopQueue(); - }//end if - }//sync - }//end if + } + } + } super.stop(svc); } + + /** + * Deprecated. Unused. Will be removed in 9.0.x + */ + @Deprecated @Override public void run() { - while ( run ) { - LinkObject link = removeFromQueue(); - if ( link == null ) continue; //should not happen unless we exceed wait time - while ( link != null && run ) { - link = sendAsyncData(link); - }//while - }//while - }//run - - protected LinkObject sendAsyncData(LinkObject link) { - ChannelMessage msg = link.data(); - Member[] destination = link.getDestination(); + // NO-OP since it is now unused. + } + + + /** + * Deprecated. Unused. Will be removed in 9.0.x + */ + @Deprecated + protected org.apache.catalina.tribes.transport.bio.util.LinkObject sendAsyncData( + org.apache.catalina.tribes.transport.bio.util.LinkObject link) { + sendAsyncData(link.data(), link.getDestination(), link.getPayload()); + return link.next(); + } + + + protected void sendAsyncData(ChannelMessage msg, Member[] destination, + InterceptorPayload payload) { + ErrorHandler handler = null; + if (payload != null) { + handler = payload.getErrorHandler(); + } try { - super.sendMessage(destination,msg,null); + super.sendMessage(destination, msg, null); try { - if (link.getHandler() != null) { - link.getHandler().handleCompletion(new UniqueId(msg.getUniqueId())); + if (handler != null) { + handler.handleCompletion(new UniqueId(msg.getUniqueId())); } } catch ( Exception ex ) { log.error(sm.getString("messageDispatchInterceptor.completeMessage.failed"),ex); } } catch ( Exception x ) { ChannelException cx = null; - if ( x instanceof ChannelException ) cx = (ChannelException)x; - else cx = new ChannelException(x); - if ( log.isDebugEnabled() ) log.debug(sm.getString("messageDispatchInterceptor.AsyncMessage.failed"),x); + if (x instanceof ChannelException) { + cx = (ChannelException) x; + } else { + cx = new ChannelException(x); + } + if (log.isDebugEnabled()) { + log.debug(sm.getString("messageDispatchInterceptor.AsyncMessage.failed"),x); + } try { - if (link.getHandler() != null) { - link.getHandler().handleError(cx, new UniqueId(msg.getUniqueId())); + if (handler != null) { + handler.handleError(cx, new UniqueId(msg.getUniqueId())); } } catch ( Exception ex ) { log.error(sm.getString("messageDispatchInterceptor.errorMessage.failed"),ex); } } finally { addAndGetCurrentSize(-msg.getMessage().getLength()); - link = link.next(); - }//try - return link; - } - - public boolean isAlwaysSend() { - return alwaysSend; - } - - public void setAlwaysSend(boolean alwaysSend) { - this.alwaysSend = alwaysSend; + } } } Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=1723504&r1=1723503&r2=1723504&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java Thu Jan 7 10:12:08 2016 @@ -33,7 +33,10 @@ import org.apache.juli.logging.LogFactor * length when you have strange producer thread problems. * * @author Peter Rossbach + * + * @deprecated Unused. Will be removed in Tomcat 9.0.x. */ +@Deprecated public class FastQueue { private static final Log log = LogFactory.getLog(FastQueue.class); Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java?rev=1723504&r1=1723503&r2=1723504&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java Thu Jan 7 10:12:08 2016 @@ -28,7 +28,10 @@ import org.apache.catalina.tribes.group. * data object and a pointer to the next element. * * @author Peter Rossbach + * + * @deprecated Unused. Will be removed in Tomcat 9.0.x */ +@Deprecated public class LinkObject { private final ChannelMessage msg; Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java?rev=1723504&r1=1723503&r2=1723504&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java Thu Jan 7 10:12:08 2016 @@ -46,8 +46,10 @@ package org.apache.catalina.tribes.trans * * @author Peter Rossbach * @version 1.1 + * + * @deprecated Unused. Will be removed in Tomcat 9.0.x */ - +@Deprecated public class SingleRemoveSynchronizedAddLock { public SingleRemoveSynchronizedAddLock() { Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java?rev=1723504&r1=1723503&r2=1723504&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java Thu Jan 7 10:12:08 2016 @@ -27,7 +27,6 @@ import org.apache.catalina.tribes.group. import org.apache.catalina.tribes.group.interceptors.DomainFilterInterceptor; import org.apache.catalina.tribes.group.interceptors.FragmentationInterceptor; import org.apache.catalina.tribes.group.interceptors.GzipInterceptor; -import org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor; import org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor; import org.apache.catalina.tribes.group.interceptors.OrderInterceptor; import org.apache.catalina.tribes.group.interceptors.StaticMembershipInterceptor; @@ -225,7 +224,7 @@ public class ChannelCreator { } if ( async ) { - MessageDispatchInterceptor mi = new MessageDispatch15Interceptor(); + MessageDispatchInterceptor mi = new MessageDispatchInterceptor(); mi.setMaxQueueSize(asyncsize); channel.addInterceptor(mi); System.out.println("Added MessageDispatchInterceptor"); Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java?rev=1723504&r1=1723503&r2=1723504&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java Thu Jan 7 10:12:08 2016 @@ -24,7 +24,7 @@ import java.util.StringTokenizer; import org.apache.catalina.tribes.Channel; import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.group.GroupChannel; -import org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor; +import org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor; import org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator; import org.apache.catalina.tribes.group.interceptors.TcpFailureDetector; import org.apache.catalina.tribes.transport.ReceiverBase; @@ -371,7 +371,7 @@ public class CoordinationDemo { }; channel.addInterceptor(interceptor); channel.addInterceptor(new TcpFailureDetector()); - channel.addInterceptor(new MessageDispatch15Interceptor()); + channel.addInterceptor(new MessageDispatchInterceptor()); return channel; } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java?rev=1723504&r1=1723503&r2=1723504&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java Thu Jan 7 10:12:08 2016 @@ -32,7 +32,7 @@ import org.apache.catalina.tribes.Manage import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.TesterUtil; import org.apache.catalina.tribes.group.GroupChannel; -import org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor; +import org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor; public class TestDataIntegrity { private int msgCount = 500; @@ -44,9 +44,9 @@ public class TestDataIntegrity { @Before public void setUp() throws Exception { channel1 = new GroupChannel(); - channel1.addInterceptor(new MessageDispatch15Interceptor()); + channel1.addInterceptor(new MessageDispatchInterceptor()); channel2 = new GroupChannel(); - channel2.addInterceptor(new MessageDispatch15Interceptor()); + channel2.addInterceptor(new MessageDispatchInterceptor()); listener1 = new Listener(); channel2.addChannelListener(listener1); TesterUtil.addRandomDomain(new ManagedChannel[] {channel1, channel2}); Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java?rev=1723504&r1=1723503&r2=1723504&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java Thu Jan 7 10:12:08 2016 @@ -35,7 +35,7 @@ import org.apache.catalina.tribes.Manage import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.TesterUtil; import org.apache.catalina.tribes.group.GroupChannel; -import org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor; +import org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor; import org.apache.catalina.tribes.group.interceptors.ThroughputInterceptor; import org.apache.catalina.tribes.io.XByteBuffer; import org.apache.catalina.tribes.transport.AbstractSender; @@ -54,9 +54,9 @@ public class TestMulticastPackages { @Before public void setUp() throws Exception { channel1 = new GroupChannel(); - channel1.addInterceptor(new MessageDispatch15Interceptor()); + channel1.addInterceptor(new MessageDispatchInterceptor()); channel2 = new GroupChannel(); - channel2.addInterceptor(new MessageDispatch15Interceptor()); + channel2.addInterceptor(new MessageDispatchInterceptor()); ThroughputInterceptor tint = new ThroughputInterceptor(); tint.setInterval(500); ThroughputInterceptor tint2 = new ThroughputInterceptor(); Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java?rev=1723504&r1=1723503&r2=1723504&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java Thu Jan 7 10:12:08 2016 @@ -35,7 +35,7 @@ import org.apache.catalina.tribes.Manage import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.TesterUtil; import org.apache.catalina.tribes.group.GroupChannel; -import org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor; +import org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor; import org.apache.catalina.tribes.group.interceptors.ThroughputInterceptor; import org.apache.catalina.tribes.io.XByteBuffer; import org.apache.catalina.tribes.transport.AbstractSender; @@ -54,9 +54,9 @@ public class TestUdpPackages { @Before public void setUp() throws Exception { channel1 = new GroupChannel(); - channel1.addInterceptor(new MessageDispatch15Interceptor()); + channel1.addInterceptor(new MessageDispatchInterceptor()); channel2 = new GroupChannel(); - channel2.addInterceptor(new MessageDispatch15Interceptor()); + channel2.addInterceptor(new MessageDispatchInterceptor()); ThroughputInterceptor tint = new ThroughputInterceptor(); tint.setInterval(500); ThroughputInterceptor tint2 = new ThroughputInterceptor(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org