You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2015/11/13 18:44:50 UTC
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes efac3c9e5 -> dd3c8f9d0
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dd3c8f9d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dd3c8f9d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dd3c8f9d
Branch: refs/heads/3.1.x-fixes
Commit: dd3c8f9d05b549d7aeb3804476bdc3fb344cf2d8
Parents: f831e9f
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Nov 13 12:44:44 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Nov 13 12:44:44 2015 -0500
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/dd3c8f9d/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8bd298f..f2766bb 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -4,6 +4,8 @@ B 39851b83af116611ce0efe70c4b9a32ee8491523
B 59b8615053ddcad353fbebcd9a5b1109ae0897a1
B 65e1e07fdb810ec9de135530ca3e3d23821836a3
B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26
+B a261507ebd3104b1a00298801ec9815ed1e7a728
B ced98c6e937bd93f92dac9043fa0406c696bfd84
+B f0e08b7bea2660542e18294d490e68c7b14aaa4b
B f1b56150d6520e73d2ade2296c3b2f13839e63e5
B fb30f8bffc85fcc3208fcc0e1eda4b54a89b5d37
[2/2] cxf git commit: Fix pmd error
Posted by dk...@apache.org.
Fix pmd error
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f831e9f5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f831e9f5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f831e9f5
Branch: refs/heads/3.1.x-fixes
Commit: f831e9f5ee56bff9e4472782300f9558ba234f80
Parents: efac3c9
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Nov 13 12:42:45 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Nov 13 12:44:44 2015 -0500
----------------------------------------------------------------------
.../websocket/atmosphere/DefaultProtocolInterceptor.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f831e9f5/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
index 3dde4b5..1a2cd9a 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
@@ -286,25 +286,28 @@ public class DefaultProtocolInterceptor extends AtmosphereInterceptorAdapter {
// a workaround to flush the header data upon close when no write operation occurs
private class WrappedAtmosphereResponse extends AtmosphereResponse {
final AtmosphereResponse response;
- final ServletOutputStream delegate;
ServletOutputStream sout;
WrappedAtmosphereResponse(AtmosphereResponse resp, AtmosphereRequest req) throws IOException {
super((HttpServletResponse)resp.getResponse(), null, req, resp.isDestroyable());
response = resp;
response.request(req);
- delegate = super.getOutputStream();
}
@Override
public ServletOutputStream getOutputStream() throws IOException {
if (sout == null) {
- sout = new BufferedServletOutputStream();
+ sout = new BufferedServletOutputStream(super.getOutputStream());
}
return sout;
}
private final class BufferedServletOutputStream extends ServletOutputStream {
+ final ServletOutputStream delegate;
CachedOutputStream out = new CachedOutputStream();
+
+ BufferedServletOutputStream(ServletOutputStream d) {
+ delegate = d;
+ }
OutputStream getOut() {
if (out == null) {