Author: markt
Date: Tue Nov 3 09:13:39 2015
New Revision: 1712226
URL: http://svn.apache.org/viewvc?rev=1712226&view=rev
Log:
String.indexOf(String) -> String.indexOf(char) where possible
More general fix for an issue identified in
https://bz.apache.org/bugzilla/show_bug.cgi?id=58541
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
tomcat/tc8.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 3 09:13:39 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,1702923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,170
3160,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
+/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,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1
666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,1702923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,1703146,1703151,170
3160,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
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
Tue Nov 3 09:13:39 2015
@@ -162,8 +162,8 @@ public class JMXAccessorQueryTask extend
if (!attrs[i].isReadable())
continue;
String attName = attrs[i].getName();
- if (attName.indexOf("=") >= 0 || attName.indexOf(":") >= 0
- || attName.indexOf(" ") >= 0) {
+ if (attName.indexOf('=') >= 0 || attName.indexOf(':') >= 0
+ || attName.indexOf(' ') >= 0) {
continue;
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
Tue Nov 3 09:13:39 2015
@@ -519,7 +519,7 @@ public class DigestAuthenticator extends
}
// Validate nonce
- int i = nonce.indexOf(":");
+ int i = nonce.indexOf(':');
if (i < 0 || (i + 1) == nonce.length()) {
return false;
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Tue Nov 3 09:13:39 2015
@@ -283,7 +283,7 @@ public class JvmRouteBinderValve extends
Request request, String sessionId, String localJvmRoute) {
// get requested jvmRoute.
String requestJvmRoute = null;
- int index = sessionId.indexOf(".");
+ int index = sessionId.indexOf('.');
if (index > 0) {
requestJvmRoute = sessionId
.substring(index + 1, sessionId.length());
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Tue Nov 3 09:13:39 2015
@@ -1699,7 +1699,7 @@ public abstract class WebappClassLoaderB
Field field = fields[i];
int mods = field.getModifiers();
if (field.getType().isPrimitive()
- || (field.getName().indexOf("$") != -1)) {
+ || (field.getName().indexOf('$') != -1)) {
continue;
}
if (Modifier.isStatic(mods)) {
@@ -1747,7 +1747,7 @@ public abstract class WebappClassLoaderB
Field field = fields[i];
int mods = field.getModifiers();
if (field.getType().isPrimitive()
- || (field.getName().indexOf("$") != -1)) {
+ || (field.getName().indexOf('$') != -1)) {
continue;
}
try {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
Tue Nov 3 09:13:39 2015
@@ -614,7 +614,7 @@ public class StatusTransformer {
if (webModuleName.startsWith("//")) {
webModuleName = webModuleName.substring(2);
}
- int slash = webModuleName.indexOf("/");
+ int slash = webModuleName.indexOf('/');
if (slash == -1) {
count++;
continue;
@@ -667,7 +667,7 @@ public class StatusTransformer {
if (name.startsWith("//")) {
name = name.substring(2);
}
- int slash = name.indexOf("/");
+ int slash = name.indexOf('/');
if (slash != -1) {
hostName = name.substring(0, slash);
contextName = name.substring(slash);
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java Tue
Nov 3 09:13:39 2015
@@ -72,9 +72,9 @@ public class MBeanDumper {
if (! attrs[i].isReadable()) continue;
String attName=attrs[i].getName();
if ("modelerType".equals(attName)) continue;
- if (attName.indexOf("=") >=0 ||
- attName.indexOf(":") >=0 ||
- attName.indexOf(" ") >=0 ) {
+ if (attName.indexOf('=') >=0 ||
+ attName.indexOf(':') >=0 ||
+ attName.indexOf(' ') >=0 ) {
continue;
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Tue
Nov 3 09:13:39 2015
@@ -110,7 +110,7 @@ public class MBeanFactory {
if ((j2eeType!=null) && (j2eeType.equals("WebModule"))) {
String name = pname.getKeyProperty("name");
name = name.substring(2);
- int i = name.indexOf("/");
+ int i = name.indexOf('/');
String hostName = name.substring(0,i);
String path = name.substring(i);
Container host = engine.findChild(hostName);
@@ -743,7 +743,7 @@ public class MBeanFactory {
Engine engine = (Engine) service.getContainer();
String name = oname.getKeyProperty("name");
name = name.substring(2);
- int i = name.indexOf("/");
+ int i = name.indexOf('/');
String hostName = name.substring(0,i);
String path = name.substring(i);
ObjectName deployer = new ObjectName(domain+":type=Deployer,host="+
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Nov
3 09:13:39 2015
@@ -2599,12 +2599,12 @@ public class JNDIRealm extends RealmBase
// strings: (|(something)(somethingelse))
while ( (userPatternString.charAt(startParenLoc + 1) == '|') ||
(startParenLoc != 0 &&
userPatternString.charAt(startParenLoc - 1) == '\\') ) {
- startParenLoc = userPatternString.indexOf("(",
startParenLoc+1);
+ startParenLoc = userPatternString.indexOf('(',
startParenLoc+1);
}
- endParenLoc = userPatternString.indexOf(")", startParenLoc+1);
+ endParenLoc = userPatternString.indexOf(')', startParenLoc+1);
// weed out escaped end-parens
while (userPatternString.charAt(endParenLoc - 1) == '\\') {
- endParenLoc = userPatternString.indexOf(")",
endParenLoc+1);
+ endParenLoc = userPatternString.indexOf(')',
endParenLoc+1);
}
String nextPathPart = userPatternString.substring
(startParenLoc+1, endParenLoc);
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Tue
Nov 3 09:13:39 2015
@@ -789,7 +789,7 @@ public final class CGIServlet extends Ht
} else {
qs = req.getQueryString();
}
- if (qs != null && qs.indexOf("=") == -1) {
+ if (qs != null && qs.indexOf('=') == -1) {
StringTokenizer qsTokens = new StringTokenizer(qs, "+");
while ( qsTokens.hasMoreTokens() ) {
cmdLineParameters.add(URLDecoder.decode(qsTokens.nextToken(),
@@ -1685,11 +1685,11 @@ public final class CGIServlet extends Ht
}
if (line.startsWith("HTTP")) {
skipBody = setStatus(response,
getSCFromHttpStatusLine(line));
- } else if (line.indexOf(":") >= 0) {
+ } else if (line.indexOf(':') >= 0) {
String header =
- line.substring(0,
line.indexOf(":")).trim();
+ line.substring(0,
line.indexOf(':')).trim();
String value =
- line.substring(line.indexOf(":") +
1).trim();
+ line.substring(line.indexOf(':') +
1).trim();
if (header.equalsIgnoreCase("status")) {
skipBody = setStatus(response,
getSCFromCGIStatusHeader(value));
} else {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Tue Nov 3 09:13:39 2015
@@ -875,7 +875,7 @@ public class WebdavServlet
if (lockDurationStr == null) {
lockDuration = DEFAULT_TIMEOUT;
} else {
- int commaPos = lockDurationStr.indexOf(",");
+ int commaPos = lockDurationStr.indexOf(',');
// If multiple timeouts, just use the first
if (commaPos != -1) {
lockDurationStr = lockDurationStr.substring(0,commaPos);
@@ -1491,7 +1491,7 @@ public class WebdavServlet
// if the Destination URL contains the protocol, we can safely
// trim everything upto the first "/" character after "://"
int firstSeparator =
- destinationPath.indexOf("/", protocolIndex + 4);
+ destinationPath.indexOf('/', protocolIndex + 4);
if (firstSeparator < 0) {
destinationPath = "/";
} else {
@@ -1503,13 +1503,13 @@ public class WebdavServlet
destinationPath = destinationPath.substring(hostName.length());
}
- int portIndex = destinationPath.indexOf(":");
+ int portIndex = destinationPath.indexOf(':');
if (portIndex >= 0) {
destinationPath = destinationPath.substring(portIndex);
}
if (destinationPath.startsWith(":")) {
- int firstSeparator = destinationPath.indexOf("/");
+ int firstSeparator = destinationPath.indexOf('/');
if (firstSeparator < 0) {
destinationPath = "/";
} else {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServlet.java Tue Nov
3 09:13:39 2015
@@ -253,7 +253,7 @@ public class JspServlet extends HttpServ
return (false); // part of some other name or value
}
int limit = queryString.length();
- int ampersand = queryString.indexOf("&");
+ int ampersand = queryString.indexOf('&');
if (ampersand > 0) {
limit = ampersand;
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Tue
Nov 3 09:13:39 2015
@@ -99,7 +99,7 @@ public class Util {
return false;
}
- int colonPos = url.indexOf(":");
+ int colonPos = url.indexOf(':');
if(colonPos == -1){
return false;
}
@@ -154,10 +154,10 @@ public class Util {
public static String stripSession(String url) {
StringBuilder u = new StringBuilder(url);
int sessionStart;
- while ((sessionStart = u.toString().indexOf(";" +
Constants.SESSION_PARAMETER_NAME + "=")) != -1) {
- int sessionEnd = u.toString().indexOf(";", sessionStart + 1);
+ while ((sessionStart = u.toString().indexOf(';' +
Constants.SESSION_PARAMETER_NAME + "=")) != -1) {
+ int sessionEnd = u.toString().indexOf(';', sessionStart + 1);
if (sessionEnd == -1)
- sessionEnd = u.toString().indexOf("?", sessionStart + 1);
+ sessionEnd = u.toString().indexOf('?', sessionStart + 1);
if (sessionEnd == -1) // still
sessionEnd = u.length();
u.delete(sessionStart, sessionEnd);
Modified: tomcat/tc8.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/juli/JdkLoggerFormatter.java Tue Nov
3 09:13:39 2015
@@ -56,7 +56,7 @@ public class JdkLoggerFormatter extends
String message=formatMessage(record);
- if( name.indexOf(".") >= 0 )
+ if( name.indexOf('.') >= 0 )
name = name.substring(name.lastIndexOf(".") + 1);
// Use a string buffer for better performance
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
Tue Nov 3 09:13:39 2015
@@ -226,14 +226,14 @@ public final class IntrospectionUtils {
*/
public static String replaceProperties(String value,
Hashtable<Object,Object> staticProp, PropertySource dynamicProp[])
{
- if (value.indexOf("$") < 0) {
+ if (value.indexOf('$') < 0) {
return value;
}
StringBuilder sb = new StringBuilder();
int prev = 0;
// assert value!=nil
int pos;
- while ((pos = value.indexOf("$", prev)) >= 0) {
+ while ((pos = value.indexOf('$', prev)) >= 0) {
if (pos > 0) {
sb.append(value.substring(prev, pos));
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java Tue Nov 3
09:13:39 2015
@@ -571,7 +571,7 @@ public final class URL implements Serial
// Parse the authority section
if (spec.indexOf("//", start) == start) {
- int pathStart = spec.indexOf("/", start + 2);
+ int pathStart = spec.indexOf('/', start + 2);
if ((pathStart >= 0) && (pathStart < limit)) {
authority = spec.substring(start + 2, pathStart);
start = pathStart;
@@ -614,7 +614,7 @@ public final class URL implements Serial
}
// Parse the path section
- if (spec.indexOf("/", start) == start) { // Absolute path
+ if (spec.indexOf('/', start) == start) { // Absolute path
path = spec.substring(start, limit);
if (query != null)
file = path + "?" + query;
Modified:
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/tc8.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Tue Nov 3 09:13:39 2015
@@ -474,8 +474,8 @@ public class PoolProperties implements P
//always add the trap interceptor to the mix
definitions[0] = new
InterceptorDefinition(TrapException.class);
for (int i=0; i<interceptorValues.length; i++) {
- int propIndex = interceptorValues[i].indexOf("(");
- int endIndex = interceptorValues[i].indexOf(")");
+ int propIndex = interceptorValues[i].indexOf('(');
+ int endIndex = interceptorValues[i].indexOf(')');
if (propIndex<0 || endIndex<0 || endIndex <= propIndex) {
definitions[i+1] = new
InterceptorDefinition(interceptorValues[i].trim());
} else {
@@ -484,7 +484,7 @@ public class PoolProperties implements P
String propsAsString =
interceptorValues[i].substring(propIndex+1, endIndex);
String[] props = propsAsString.split(",");
for (int j=0; j<props.length; j++) {
- int pidx = props[j].indexOf("=");
+ int pidx = props[j].indexOf('=');
String propName =
props[j].substring(0,pidx).trim();
String propValue =
props[j].substring(pidx+1).trim();
definitions[i+1].addProperty(new
InterceptorProperty(propName,propValue));
@@ -957,7 +957,7 @@ public class PoolProperties implements P
@SuppressWarnings("unchecked")
public Class<? extends JdbcInterceptor> getInterceptorClass() throws
ClassNotFoundException {
if (clazz==null) {
- if (getClassName().indexOf(".")<0) {
+ if (getClassName().indexOf('.')<0) {
if (log.isDebugEnabled()) {
log.debug("Loading interceptor
class:"+PoolConfiguration.PKG_PREFIX+getClassName());
}
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1712226&r1=1712225&r2=1712226&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
Tue Nov 3 09:13:39 2015
@@ -302,7 +302,7 @@ public class TestDigestAuthenticator ext
String authHeader = authHeaders.iterator().next();
int start = authHeader.indexOf("nonce=\"") + 7;
- int end = authHeader.indexOf("\"", start);
+ int end = authHeader.indexOf('\'', start);
return authHeader.substring(start, end);
}
@@ -313,7 +313,7 @@ public class TestDigestAuthenticator ext
String authHeader = authHeaders.iterator().next();
int start = authHeader.indexOf("opaque=\"") + 8;
- int end = authHeader.indexOf("\"", start);
+ int end = authHeader.indexOf('\'', start);
return authHeader.substring(start, end);
}
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=1712226&r1=1712225&r2=1712226&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
Tue Nov 3 09:13:39 2015
@@ -130,7 +130,7 @@ public class ChannelCreator {
System.out.println("Setting
MessageDispatchInterceptor.maxQueueSize="+asyncsize);
} else if ("-static".equals(args[i])) {
String d = args[++i];
- String h = d.substring(0,d.indexOf(":"));
+ String h = d.substring(0,d.indexOf(':'));
String p = d.substring(h.length()+1);
Member m = new MemberImpl(h,Integer.parseInt(p),2000);
staticMembers.add(m);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
