Author: coheigea
Date: Fri Oct  5 11:26:23 2012
New Revision: 1394449

URL: http://svn.apache.org/viewvc?rev=1394449&view=rev
Log:
Backporting specific bug from trunk


Conflicts:

        
rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java

Modified:
    
cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java

Modified: 
cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java?rev=1394449&r1=1394448&r2=1394449&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java
 Fri Oct  5 11:26:23 2012
@@ -223,7 +223,7 @@ public class EffectivePolicyImpl impleme
         PolicyInterceptorProvider pp = reg.get(qn);
         if (pp != null) {
             List<Interceptor<? extends org.apache.cxf.message.Message>> i = 
null;
-            if (useIn & !fault) {
+            if (useIn && !fault) {
                 i = pp.getInInterceptors();
             } else if (!useIn && !fault) {
                 i = pp.getOutInterceptors();


Reply via email to