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 2013/09/19 13:06:24 UTC
svn commit: r1524691 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/tomcat/websocket/FutureToSendHandler.java
java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Author: markt
Date: Thu Sep 19 11:06:23 2013
New Revision: 1524691
URL: http://svn.apache.org/r1524691
Log:
Extract FutureToSendHandler to a separate file
Added:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/FutureToSendHandler.java
- copied unchanged from r1524668, tomcat/trunk/java/org/apache/tomcat/websocket/FutureToSendHandler.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1524668
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1524691&r1=1524690&r2=1524691&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java Thu Sep 19 11:06:23 2013
@@ -27,7 +27,6 @@ import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.List;
import java.util.Queue;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
@@ -776,69 +775,6 @@ public abstract class WsRemoteEndpointIm
}
}
- /**
- * Converts a Future to a SendHandler.
- */
- private static class FutureToSendHandler
- implements Future<Void>, SendHandler {
-
- private final CountDownLatch latch = new CountDownLatch(1);
- private volatile SendResult result = null;
-
- // --------------------------------------------------------- SendHandler
-
- @Override
- public void onResult(SendResult result) {
- this.result = result;
- latch.countDown();
- }
-
-
- // -------------------------------------------------------------- Future
-
- @Override
- public boolean cancel(boolean mayInterruptIfRunning) {
- // Cancelling the task is not supported
- return false;
- }
-
- @Override
- public boolean isCancelled() {
- // Cancelling the task is not supported
- return false;
- }
-
- @Override
- public boolean isDone() {
- return latch.getCount() == 0;
- }
-
- @Override
- public Void get() throws InterruptedException,
- ExecutionException {
- latch.await();
- if (result.getException() != null) {
- throw new ExecutionException(result.getException());
- }
- return null;
- }
-
- @Override
- public Void get(long timeout, TimeUnit unit)
- throws InterruptedException, ExecutionException,
- TimeoutException {
- boolean retval = latch.await(timeout, unit);
- if (retval == false) {
- throw new TimeoutException();
- }
- if (result.getException() != null) {
- throw new ExecutionException(result.getException());
- }
- return null;
- }
- }
-
-
private static class WsOutputStream extends OutputStream {
private final WsRemoteEndpointImplBase endpoint;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org