cxf git commit: replace the old method usage with the new one

2016-04-05 Thread ay
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d7bdfe5f1 -> b4870788d


replace the old method usage with the new one


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b4870788
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b4870788
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b4870788

Branch: refs/heads/3.0.x-fixes
Commit: b4870788d04c2da796fac61f119d5f14298a508d
Parents: d7bdfe5
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 23:12:51 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 23:16:51 2016 +0200

--
 .../websocket/atmosphere/DefaultProtocolInterceptor.java | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b4870788/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 867faae..5a188f4 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
@@ -21,7 +21,6 @@ package org.apache.cxf.transport.websocket.atmosphere;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.Deque;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -160,12 +159,7 @@ public class DefaultProtocolInterceptor extends 
AtmosphereInterceptorAdapter {
 AsyncIOWriter writer = res.getAsyncIOWriter();
 
 if (writer instanceof AtmosphereInterceptorWriter) {
-//REVIST need a better way to add a custom filter at the first 
entry and not at the last as
-// e.g. interceptor(AsyncIOInterceptor interceptor, int position)
-Deque filters = 
AtmosphereInterceptorWriter.class.cast(writer).filters();
-if (!filters.contains(interceptor)) {
-filters.addFirst(interceptor);
-}
+
AtmosphereInterceptorWriter.class.cast(writer).interceptor(interceptor, 0);
 }
 }
 



cxf git commit: replace the old method usage with the new one

2016-04-05 Thread ay
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 1b30b3c83 -> 3fac6a1dd


replace the old method usage with the new one


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3fac6a1d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3fac6a1d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3fac6a1d

Branch: refs/heads/3.1.x-fixes
Commit: 3fac6a1dd724f3524eda742a01f8d1ffbcc55d0f
Parents: 1b30b3c
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 23:12:51 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 23:13:22 2016 +0200

--
 .../websocket/atmosphere/DefaultProtocolInterceptor.java | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/3fac6a1d/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 54d8645..41e3ccb 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
@@ -22,7 +22,6 @@ package org.apache.cxf.transport.websocket.atmosphere;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Deque;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -244,12 +243,7 @@ public class DefaultProtocolInterceptor extends 
AtmosphereInterceptorAdapter {
 AsyncIOWriter writer = res.getAsyncIOWriter();
 
 if (writer instanceof AtmosphereInterceptorWriter) {
-//REVIST need a better way to add a custom filter at the first 
entry and not at the last as
-// e.g. interceptor(AsyncIOInterceptor interceptor, int position)
-Deque filters = 
AtmosphereInterceptorWriter.class.cast(writer).filters();
-if (!filters.contains(interceptor)) {
-filters.addFirst(interceptor);
-}
+
AtmosphereInterceptorWriter.class.cast(writer).interceptor(interceptor, 0);
 }
 }
 



cxf git commit: replace the old method usage with the new one

2016-04-05 Thread ay
Repository: cxf
Updated Branches:
  refs/heads/master 1cb545acd -> 435a0c7da


replace the old method usage with the new one


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/435a0c7d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/435a0c7d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/435a0c7d

Branch: refs/heads/master
Commit: 435a0c7dad8c4e8c15a6bf39f469cce2047fa365
Parents: 1cb545a
Author: Akitoshi Yoshida 
Authored: Tue Apr 5 23:12:51 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Apr 5 23:12:51 2016 +0200

--
 .../websocket/atmosphere/DefaultProtocolInterceptor.java | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/435a0c7d/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 e019cf9..02e0863 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
@@ -22,7 +22,6 @@ package org.apache.cxf.transport.websocket.atmosphere;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Deque;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -246,12 +245,7 @@ public class DefaultProtocolInterceptor extends 
AtmosphereInterceptorAdapter {
 AsyncIOWriter writer = res.getAsyncIOWriter();
 
 if (writer instanceof AtmosphereInterceptorWriter) {
-//REVIST need a better way to add a custom filter at the first 
entry and not at the last as
-// e.g. interceptor(AsyncIOInterceptor interceptor, int position)
-Deque filters = 
AtmosphereInterceptorWriter.class.cast(writer).filters();
-if (!filters.contains(interceptor)) {
-filters.addFirst(interceptor);
-}
+
AtmosphereInterceptorWriter.class.cast(writer).interceptor(interceptor, 0);
 }
 }