Fix FindBugs warnings. activeRemoteStreamCount wasn't thread safe.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1687346 13f79535-47bb-0310-9956-ffa450edef68
apache · Jun 24, 2015 · 74ed117 · 74ed117
1 parent 0cc544a
commit 74ed117
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -117,7 +117,7 @@ public class Http2UpgradeHandler extends AbstractStream implements InternalHttpU
     private long writeTimeout = 10000;
 
     private final Map<Integer,Stream> streams = new HashMap<>();
-    private volatile int activeRemoteStreamCount = 0;
+    private final AtomicInteger activeRemoteStreamCount = new AtomicInteger(0);
     private volatile int maxRemoteStreamId = 0;
     // Start at -1 so the 'add 2' logic in closeIdleStreams() works
     private volatile int maxActiveRemoteStreamId = -1;
@@ -144,7 +144,7 @@ public Http2UpgradeHandler(Adapter adapter, Request coyoteRequest) {
             streams.put(key, stream);
             maxRemoteStreamId = 1;
             maxActiveRemoteStreamId = 1;
-            activeRemoteStreamCount = 1;
+            activeRemoteStreamCount.set(1);
             maxProcessedStreamId = 1;
         }
     }
@@ -449,7 +449,7 @@ void writeBody(Stream stream, ByteBuffer data, int len, boolean finished) throws
                 header[4] = FLAG_END_OF_STREAM;
                 stream.sentEndOfStream();
                 if (!stream.isActive()) {
-                    activeRemoteStreamCount--;
+                    activeRemoteStreamCount.decrementAndGet();
                 }
              }
             ByteUtil.set31Bits(header, 5, stream.getIdentifier().intValue());
@@ -788,7 +788,7 @@ public void receiveEndOfStream(int streamId) throws ConnectionException {
         Stream stream = getStream(streamId, true);
         stream.receivedEndOfStream();
         if (!stream.isActive()) {
-            activeRemoteStreamCount--;
+            activeRemoteStreamCount.decrementAndGet();
         }
     }
 
@@ -811,9 +811,8 @@ public HeaderEmitter headersStart(int streamId) throws Http2Exception {
         stream.checkState(FrameType.HEADERS);
         stream.receivedStartOfHeaders();
         closeIdleStreams(streamId);
-        if (localSettings.getMaxConcurrentStreams() > activeRemoteStreamCount) {
+        if (localSettings.getMaxConcurrentStreams() > activeRemoteStreamCount.incrementAndGet()) {
-            activeRemoteStreamCount++;
+            activeRemoteStreamCount.decrementAndGet();
-        } else {
             throw new StreamException(sm.getString("upgradeHandler.tooManyRemoteStreams",
                     Long.toString(localSettings.getMaxConcurrentStreams())),
                     Http2Error.REFUSED_STREAM, streamId);