Author: markt
Date: Tue Jun 21 18:44:58 2011
New Revision: 1138132
URL: http://svn.apache.org/viewvc?rev=1138132&view=rev
Log:
Fix Eclipse warnings in Valves
Modified:
tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java?rev=1138132&r1=1138131&r2=1138132&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java Tue Jun 21
18:44:58 2011
@@ -191,6 +191,8 @@ public class SemaphoreValve extends Valv
/**
* Subclass friendly method to add conditions.
+ * @param request
+ * @param response
*/
public boolean controlConcurrency(Request request, Response response) {
return true;
@@ -200,6 +202,8 @@ public class SemaphoreValve extends Valv
/**
* Subclass friendly method to add error handling when a permit isn't
* granted.
+ * @param request
+ * @param response
* @throws IOException
* @throws ServletException
*/
Modified:
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java?rev=1138132&r1=1138131&r2=1138132&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
Tue Jun 21 18:44:58 2011
@@ -136,9 +136,10 @@ public class StuckThreadDetectionValve e
if (log.isWarnEnabled()) {
String msg = sm.getString(
"stuckThreadDetectionValve.notifyStuckThreadDetected",
- monitoredThread.getThread().getName(), activeTime,
- monitoredThread.getStartTime(), numStuckThreads,
- monitoredThread.getRequestUri(), threshold);
+ monitoredThread.getThread().getName(),
Long.valueOf(activeTime),
+ monitoredThread.getStartTime(),
+ Integer.valueOf(numStuckThreads),
+ monitoredThread.getRequestUri(), Integer.valueOf(threshold));
// msg += "\n" + getStackTraceAsString(trace);
Throwable th = new Throwable();
th.setStackTrace(monitoredThread.getThread().getStackTrace());
@@ -151,7 +152,8 @@ public class StuckThreadDetectionValve e
if (log.isWarnEnabled()) {
String msg = sm.getString(
"stuckThreadDetectionValve.notifyStuckThreadCompleted",
- threadName, activeTime, numStuckThreads);
+ threadName, Long.valueOf(activeTime),
+ Integer.valueOf(numStuckThreads));
// Since the "stuck thread notification" is warn, this should also
// be warn
log.warn(msg);
@@ -227,13 +229,13 @@ public class StuckThreadDetectionValve e
List<Long> idList = new ArrayList<Long>();
for (MonitoredThread monitoredThread : activeThreads.values()) {
if (monitoredThread.isMarkedAsStuck()) {
- idList.add(monitoredThread.getThread().getId());
+ idList.add(Long.valueOf(monitoredThread.getThread().getId()));
}
}
long[] result = new long[idList.size()];
for (int i = 0; i < result.length; i++) {
- result[i] = idList.get(i);
+ result[i] = idList.get(i).longValue();
}
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
