summaryrefslogtreecommitdiff
blob: 1b2d151135566f983d75eacdf5384d8eae1440cd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
--- a/org/eclipse/jetty/continuation/Jetty6Continuation.java	2013-05-12 16:02:19.980222801 +0200
+++ b/org/eclipse/jetty/continuation/Jetty6Continuation.java	2013-05-12 16:02:12.233556821 +0200
@@ -44,7 +44,7 @@
 
     private final ServletRequest _request;
     private ServletResponse _response;
-    private final org.mortbay.util.ajax.Continuation _j6Continuation;
+    private final Object _j6Continuation;
 
     private Throwable _retry;
     private int _timeout;
@@ -55,7 +55,7 @@
     private boolean _responseWrapped=false;
     private List<ContinuationListener> _listeners;
 
-    public Jetty6Continuation(ServletRequest request, org.mortbay.util.ajax.Continuation continuation)
+    public Jetty6Continuation(ServletRequest request, Object continuation)
     {
         if (!ContinuationFilter._initialized)
         {
@@ -80,8 +80,8 @@
             if (_resumed)
                 throw new IllegalStateException();
             _completed=true;
-            if (_j6Continuation.isPending())
-                _j6Continuation.resume();
+//            if (_j6Continuation.isPending())
+//                _j6Continuation.resume();
         }
     }
 
@@ -150,8 +150,8 @@
             if (_completed)
                 throw new IllegalStateException();
             _resumed=true;
-            if (_j6Continuation.isPending())
-                _j6Continuation.resume();
+//            if (_j6Continuation.isPending())
+//                _j6Continuation.resume();
         }
     }
 
@@ -174,7 +174,7 @@
             _resumed=false;
             _expired=false;
             _completed=false;
-            _j6Continuation.suspend(_timeout);
+//            _j6Continuation.suspend(_timeout);
         }
         catch(Throwable retry)
         {
@@ -192,7 +192,7 @@
             _resumed=false;
             _expired=false;
             _completed=false;
-            _j6Continuation.suspend(_timeout);
+//            _j6Continuation.suspend(_timeout);
         }
         catch(Throwable retry)
         {
@@ -225,12 +225,12 @@
     public boolean enter(ServletResponse response)
     {
         _response=response;
-        _expired=!_j6Continuation.isResumed();
+//        _expired=!_j6Continuation.isResumed();
 
         if (_initial)
             return true;
 
-        _j6Continuation.reset();
+//        _j6Continuation.reset();
 
         if (_expired)
         {