You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/07/12 23:10:14 UTC
svn commit: r1360946 -
/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
Author: markt
Date: Thu Jul 12 21:10:13 2012
New Revision: 1360946
URL: http://svn.apache.org/viewvc?rev=1360946&view=rev
Log:
Fix a FindBugs warning (increment of volatile not atomic)
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=1360946&r1=1360945&r2=1360946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Thu Jul 12 21:10:13 2012
@@ -20,6 +20,7 @@ package org.apache.catalina.core;
import java.io.IOException;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher;
@@ -67,8 +68,8 @@ final class StandardWrapperValve
private volatile long processingTime;
private volatile long maxTime;
private volatile long minTime = Long.MAX_VALUE;
- private volatile int requestCount;
- private volatile int errorCount;
+ private final AtomicInteger requestCount = new AtomicInteger(0);
+ private final AtomicInteger errorCount = new AtomicInteger(0);
/**
@@ -100,7 +101,7 @@ final class StandardWrapperValve
Throwable throwable = null;
// This should be a Request attribute...
long t1=System.currentTimeMillis();
- requestCount++;
+ requestCount.incrementAndGet();
StandardWrapper wrapper = (StandardWrapper) getContainer();
Servlet servlet = null;
Context context = (Context) wrapper.getParent();
@@ -522,64 +523,24 @@ final class StandardWrapperValve
return processingTime;
}
- /**
- * Deprecated unused
- */
- @Deprecated
- public void setProcessingTime(long processingTime) {
- this.processingTime = processingTime;
- }
-
public long getMaxTime() {
return maxTime;
}
- /**
- * Deprecated unused
- */
- @Deprecated
- public void setMaxTime(long maxTime) {
- this.maxTime = maxTime;
- }
-
public long getMinTime() {
return minTime;
}
- /**
- * Deprecated unused
- */
- @Deprecated
- public void setMinTime(long minTime) {
- this.minTime = minTime;
- }
-
public int getRequestCount() {
- return requestCount;
- }
-
- /**
- * Deprecated unused
- */
- @Deprecated
- public void setRequestCount(int requestCount) {
- this.requestCount = requestCount;
+ return requestCount.get();
}
public int getErrorCount() {
- return errorCount;
+ return errorCount.get();
}
public void incrementErrorCount() {
- errorCount++;
- }
-
- /**
- * Deprecated unused
- */
- @Deprecated
- public void setErrorCount(int errorCount) {
- this.errorCount = errorCount;
+ errorCount.incrementAndGet();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org