Author: dkulp Date: Fri Mar 15 21:01:04 2013 New Revision: 1457113 URL: http://svn.apache.org/r1457113 Log: Merged revisions 1457108 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1457108 | dkulp | 2013-03-15 16:52:05 -0400 (Fri, 15 Mar 2013) | 10 lines Merged revisions 1457081 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1457081 | dkulp | 2013-03-15 15:49:42 -0400 (Fri, 15 Mar 2013) | 2 lines Fix typo ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=1457113&r1=1457112&r2=1457113&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original) +++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Fri Mar 15 21:01:04 2013 @@ -690,9 +690,7 @@ public class EndpointImpl extends javax. } public Interceptor<? extends Message> remove(int index) { Interceptor<? extends Message> o = orig.remove(index); - if (o == null) { - other.remove(o); - } + other.remove(o); return o; } public boolean removeAll(Collection<?> c) {
