Author: kkolinko
Date: Wed Oct 28 02:54:00 2015
New Revision: 1710930
URL: http://svn.apache.org/viewvc?rev=1710930&view=rev
Log:
For https://bz.apache.org/bugzilla/show_bug.cgi?id=58547 (reviewing r1710760)
Replace X.valueOf(String).xValue() with simple x.parseX().
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1710930&r1=1710929&r2=1710930&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Wed Oct
28 02:54:00 2015
@@ -881,15 +881,13 @@ public class WebdavServlet
lockDurationStr = lockDurationStr.substring(0,commaPos);
}
if (lockDurationStr.startsWith("Second-")) {
- lockDuration =
- (Integer.valueOf(lockDurationStr.substring(7))).intValue();
+ lockDuration = Integer.parseInt(lockDurationStr.substring(7));
} else {
if (lockDurationStr.equalsIgnoreCase("infinity")) {
lockDuration = MAX_TIMEOUT;
} else {
try {
- lockDuration =
- (Integer.valueOf(lockDurationStr)).intValue();
+ lockDuration = Integer.parseInt(lockDurationStr);
} catch (NumberFormatException e) {
lockDuration = MAX_TIMEOUT;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1710930&r1=1710929&r2=1710930&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Wed Oct 28 02:54:00 2015
@@ -196,7 +196,7 @@ public class McastService implements Mem
public int getRecoveryCounter(){
String p = properties.getProperty("recoveryCounter");
if(p != null){
- return Integer.valueOf(p).intValue();
+ return Integer.parseInt(p);
}
return -1;
}
@@ -208,7 +208,7 @@ public class McastService implements Mem
public boolean getRecoveryEnabled() {
String p = properties.getProperty("recoveryEnabled");
if(p != null){
- return Boolean.valueOf(p).booleanValue();
+ return Boolean.parseBoolean(p);
}
return false;
}
@@ -220,7 +220,7 @@ public class McastService implements Mem
public long getRecoverySleepTime(){
String p = properties.getProperty("recoverySleepTime");
if(p != null){
- return Long.valueOf(p).longValue();
+ return Long.parseLong(p);
}
return -1;
}
@@ -232,14 +232,14 @@ public class McastService implements Mem
public boolean getLocalLoopbackDisabled() {
String p = properties.getProperty("localLoopbackDisabled");
if(p != null){
- return Boolean.valueOf(p).booleanValue();
+ return Boolean.parseBoolean(p);
}
return false;
}
public int getPort() {
String p = properties.getProperty("mcastPort");
- return Integer.valueOf(p).intValue();
+ return Integer.parseInt(p);
}
public void setFrequency(long time) {
@@ -248,7 +248,7 @@ public class McastService implements Mem
public long getFrequency() {
String p = properties.getProperty("mcastFrequency");
- return Long.valueOf(p).longValue();
+ return Long.parseLong(p);
}
public void setMcastDropTime(long time) {
@@ -260,7 +260,7 @@ public class McastService implements Mem
public long getDropTime() {
String p = properties.getProperty("memberDropTime");
- return Long.valueOf(p).longValue();
+ return Long.parseLong(p);
}
/**
@@ -348,9 +348,9 @@ public class McastService implements Mem
soTimeout,
this,
this,
-
Boolean.valueOf(properties.getProperty("localLoopbackDisabled","false")).booleanValue());
+
Boolean.parseBoolean(properties.getProperty("localLoopbackDisabled","false")));
String value = properties.getProperty("recoveryEnabled","true");
- boolean recEnabled = Boolean.valueOf(value).booleanValue() ;
+ boolean recEnabled = Boolean.parseBoolean(value);
impl.setRecoveryEnabled(recEnabled);
int recCnt =
Integer.parseInt(properties.getProperty("recoveryCounter","10"));
impl.setRecoveryCounter(recCnt);
Modified: tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java?rev=1710930&r1=1710929&r2=1710930&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/PageInfo.java Wed Oct 28
02:54:00 2015
@@ -455,8 +455,8 @@ class PageInfo {
}
try {
@SuppressWarnings("null") // value can't be null here
- Integer k = Integer.valueOf(value.substring(0,
value.length()-2));
- buffer = k.intValue() * 1024;
+ int k = Integer.parseInt(value.substring(0, value.length()-2));
+ buffer = k * 1024;
} catch (NumberFormatException e) {
if (n == null) {
err.jspError("jsp.error.page.invalid.buffer");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
