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 2010/09/14 19:18:06 UTC
svn commit: r996999 - in /cxf/branches/2.2.x-fixes: ./
api/src/main/java/org/apache/cxf/interceptor/
api/src/main/java/org/apache/cxf/phase/
rt/core/src/main/java/org/apache/cxf/transport/
Author: dkulp
Date: Tue Sep 14 17:18:06 2010
New Revision: 996999
URL: http://svn.apache.org/viewvc?rev=996999&view=rev
Log:
Merged revisions 995331 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r995331 | ningjiang | 2010-09-09 02:42:08 -0400 (Thu, 09 Sep 2010) | 1 line
CXF-2984 Added getState() method into InterceptorChain
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java?rev=996999&r1=996998&r2=996999&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java (original)
+++ cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java Tue Sep 14 17:18:06 2010
@@ -72,6 +72,8 @@ public interface InterceptorChain extend
void reset();
+ State getState();
+
ListIterator<Interceptor<? extends Message>> getIterator();
MessageObserver getFaultObserver();
Modified: cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=996999&r1=996998&r2=996999&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original)
+++ cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Tue Sep 14 17:18:06 2010
@@ -154,7 +154,6 @@ public class PhaseInterceptorChain imple
return CURRENT_MESSAGE.get();
}
- // this method should really be on the InterceptorChain interface
public State getState() {
return state;
}
Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java?rev=996999&r1=996998&r2=996999&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java (original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java Tue Sep 14 17:18:06 2010
@@ -38,7 +38,6 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseChainCache;
-import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.ServiceImpl;
@@ -60,10 +59,10 @@ public class ChainInitiationObserver imp
Bus origBus = BusFactory.getThreadDefaultBus(false);
BusFactory.setThreadDefaultBus(bus);
try {
- PhaseInterceptorChain phaseChain = null;
+ InterceptorChain phaseChain = null;
- if (m.getInterceptorChain() instanceof PhaseInterceptorChain) {
- phaseChain = (PhaseInterceptorChain)m.getInterceptorChain();
+ if (m.getInterceptorChain() != null) {
+ phaseChain = m.getInterceptorChain();
synchronized (phaseChain) {
if (phaseChain.getState() == InterceptorChain.State.PAUSED) {
phaseChain.resume();
@@ -114,7 +113,7 @@ public class ChainInitiationObserver imp
BusFactory.setThreadDefaultBus(origBus);
}
}
- private void addToChain(PhaseInterceptorChain chain, Message m) {
+ private void addToChain(InterceptorChain chain, Message m) {
Collection<InterceptorProvider> providers
= CastUtils.cast((Collection<?>)m.get(Message.INTERCEPTOR_PROVIDERS));
if (providers != null) {