svn commit: r1082265 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java

[dkulp]

Author: dkulp
Date: Wed Mar 16 19:13:50 2011
New Revision: 1082265

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

........
  r1082261 | dkulp | 2011-03-16 15:03:29 -0400 (Wed, 16 Mar 2011) | 1 line
  
  [CXF-3406] Restore handler props in finally block
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java

Propchange: cxf/branches/2.3.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: 
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java?rev=1082265&r1=1082264&r2=1082265&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
 Wed Mar 16 19:13:50 2011
@@ -59,7 +59,6 @@ public class JAXWSMethodInvoker extends 
                 params = Collections.singletonList(null);
             }
             res = CastUtils.cast((List)super.invoke(exchange, serviceObject, 
m, params));
-            addHandlerProperties(ctx, handlerScopedStuff);
             //update the webservice response context
             updateWebServiceContext(exchange, ctx);
         } catch (Fault f) {
@@ -67,6 +66,7 @@ public class JAXWSMethodInvoker extends 
             updateHeader(exchange, ctx);
             throw f;
         } finally {
+            addHandlerProperties(ctx, handlerScopedStuff);
             //clear the WebServiceContextImpl's ThreadLocal variable
             WebServiceContextImpl.clear();
         }