diff options
| author |   Tom Wijsman <TomWij@live.com> | 2013-05-15 09:06:37 +0200 |
|---|---|---|
| committer | Tom Wijsman <TomWij@live.com> | 2013-05-15 09:06:37 +0200 |
| commit | 2ac0a0aad36b0b16a3e44e4dac3d831d03f1b947 (patch) | |
| tree | 1cd4f0aa77a3a27cedb6f798f1588bbe48cea26a /dev-java/jetty-server/files/jetty-server-8.1.10-j6c.patch | |
| parent | Added Eclipse Jetty dependencies for Eclipse SDK. (diff) | |
| download | TomWij-2ac0a0aad36b0b16a3e44e4dac3d831d03f1b947.tar.gz TomWij-2ac0a0aad36b0b16a3e44e4dac3d831d03f1b947.tar.bz2 TomWij-2ac0a0aad36b0b16a3e44e4dac3d831d03f1b947.zip | |
Dropped the eclipse- prefix since Eclipse took over the Jetty project and therefore there is no separation necessary.
Package-Manager: portage-2.1.11.63
Manifest-Sign-Key: 6D34E57D
Diffstat (limited to 'dev-java/jetty-server/files/jetty-server-8.1.10-j6c.patch')
| -rw-r--r-- | dev-java/jetty-server/files/jetty-server-8.1.10-j6c.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/dev-java/jetty-server/files/jetty-server-8.1.10-j6c.patch b/dev-java/jetty-server/files/jetty-server-8.1.10-j6c.patch new file mode 100644 index 0000000..1b2d151 --- /dev/null +++ b/dev-java/jetty-server/files/jetty-server-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) + { |