summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/jetty-continuation/files/jetty-continuation-8.1.10-j6c.patch')
-rw-r--r--dev-java/jetty-continuation/files/jetty-continuation-8.1.10-j6c.patch75
1 files changed, 75 insertions, 0 deletions
diff --git a/dev-java/jetty-continuation/files/jetty-continuation-8.1.10-j6c.patch b/dev-java/jetty-continuation/files/jetty-continuation-8.1.10-j6c.patch
new file mode 100644
index 0000000..1b2d151
--- /dev/null
+++ b/dev-java/jetty-continuation/files/jetty-continuation-8.1.10-j6c.patch
@@ -0,0 +1,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)
+ {