svn commit: r669673 - in /cxf/branches/2.0.x-fixes: ./ rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java

[dkulp]

Author: dkulp
Date: Thu Jun 19 13:22:07 2008
New Revision: 669673

URL: http://svn.apache.org/viewvc?rev=669673&view=rev
Log:
Merged revisions 669505 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r669505 | dkulp | 2008-06-19 11:25:29 -0400 (Thu, 19 Jun 2008) | 2 lines
  
  Coloc interceptor has instance state and thus cannot be static
........

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    
cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
    
cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java?rev=669673&r1=669672&r2=669673&view=diff
==============================================================================
--- 
cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
 Thu Jun 19 13:22:07 2008
@@ -59,6 +59,10 @@
     public ColocOutInterceptor() {
         super(Phase.POST_LOGICAL);
     }
+    public ColocOutInterceptor(Bus b) {
+        super(Phase.POST_LOGICAL);
+        bus = b;
+    }
 
     public void setBus(Bus bus) {
         this.bus = bus; 

Modified: 
cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java?rev=669673&r1=669672&r2=669673&view=diff
==============================================================================
--- 
cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java
 (original)
+++ 
cxf/branches/2.0.x-fixes/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java
 Thu Jun 19 13:22:07 2008
@@ -28,8 +28,6 @@
 import org.apache.cxf.interceptor.InterceptorProvider;
 
 public class ColocFeature extends AbstractFeature {
-    private static final ColocOutInterceptor COLOC_OUT = new 
ColocOutInterceptor();
-    private static final ColocInInterceptor COLOC_IN = new 
ColocInInterceptor();
 
     @Override
     public void initialize(Client client, Bus bus) {
@@ -41,8 +39,7 @@
     
     @Override
     protected void initializeProvider(InterceptorProvider provider, Bus bus) {
-        COLOC_OUT.setBus(bus);
-        provider.getInInterceptors().add(COLOC_IN);
-        provider.getOutInterceptors().add(COLOC_OUT);
+        provider.getInInterceptors().add(new ColocInInterceptor());
+        provider.getOutInterceptors().add(new ColocOutInterceptor(bus));
     }
 }