Author: markt
Date: Fri Dec 7 19:44:40 2018
New Revision: 1848418
URL: http://svn.apache.org/viewvc?rev=1848418&view=rev
Log:
Fix IDE nags
Modified:
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1848418&r1=1848417&r2=1848418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Fri Dec 7
19:44:40 2018
@@ -1071,7 +1071,8 @@ public class ExpiresFilter extends Filte
try {
ints[i] = Integer.parseInt(intAsString);
} catch (NumberFormatException e) {
- throw new
RuntimeException(sm.getString("expiresFilter.numberError", i,
commaDelimitedInts));
+ throw new
RuntimeException(sm.getString("expiresFilter.numberError",
+ Integer.valueOf(i), commaDelimitedInts));
}
}
return ints;
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java?rev=1848418&r1=1848417&r2=1848418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java Fri Dec
7 19:44:40 2018
@@ -94,7 +94,8 @@ public class CollectedInfo {
shost = null;
}
if (objName == null) {
- throw new Exception(sm.getString("collectedInfo.noConnector",
host, port));
+ throw new Exception(sm.getString("collectedInfo.noConnector",
+ host, Integer.valueOf(port)));
}
this.port = iport;
this.host = shost;
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java?rev=1848418&r1=1848417&r2=1848418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java Fri Dec 7
19:44:40 2018
@@ -143,7 +143,7 @@ public class TcpSender
responseStatus =
responseStatus.substring(responseStatus.indexOf(' ') + 1,
responseStatus.indexOf(' ', responseStatus.indexOf(' ') + 1));
int status = Integer.parseInt(responseStatus);
if (status != 200) {
- log.error(sm.getString("tcpSender.responseErrorCode",
status));
+ log.error(sm.getString("tcpSender.responseErrorCode",
Integer.valueOf(status)));
close(i);
continue;
}
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java?rev=1848418&r1=1848417&r2=1848418&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java Fri
Dec 7 19:44:40 2018
@@ -245,7 +245,7 @@ public class FileMessageFactory {
if (msg.getMessageNumber() <= lastMessageProcessed.get()) {
// Duplicate of message already processed
log.warn(sm.getString("fileMessageFactory.duplicateMessage",
msg.getContextName(), msg.getFileName(),
- HexUtils.toHexString(msg.getData()), msg.getDataLength()));
+ HexUtils.toHexString(msg.getData()),
Integer.valueOf(msg.getDataLength())));
return false;
}
@@ -254,7 +254,7 @@ public class FileMessageFactory {
if (previous != null) {
// Duplicate of message not yet processed
log.warn(sm.getString("fileMessageFactory.duplicateMessage",
msg.getContextName(), msg.getFileName(),
- HexUtils.toHexString(msg.getData()), msg.getDataLength()));
+ HexUtils.toHexString(msg.getData()),
Integer.valueOf(msg.getDataLength())));
return false;
}
@@ -351,6 +351,7 @@ public class FileMessageFactory {
* @throws Exception An error occurred
* @deprecated
*/
+ @Deprecated
public static void main(String[] args) throws Exception {
System.out.println("Usage: FileMessageFactory fileToBeRead
fileToBeWritten");
System.out.println("Usage: This will make a copy of the file on the
local file system");
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=1848418&r1=1848417&r2=1848418&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Fri Dec 7 19:44:40 2018
@@ -833,7 +833,8 @@ public class NonBlockingCoordinator exte
@Override
public String toString() {
Member local = interceptor.getLocalMember(false);
- return sm.getString("nonBlockingCoordinator.report", type, (local
!= null ? local.getName() : ""),
+ return sm.getString("nonBlockingCoordinator.report",
Integer.valueOf(type),
+ (local != null ? local.getName() : ""),
(coord != null ? coord.getName() : ""),
Arrays.toNameString(view != null ? view.getMembers() :
null),
Arrays.toNameString(suggestedView != null ?
suggestedView.getMembers() : null),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
