cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: Updating JAXRsInInterceptor a bit more
Date Fri, 16 May 2014 10:37:52 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 190f6e24d -> e43f4527e


Updating JAXRsInInterceptor a bit more


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e43f4527
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e43f4527
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e43f4527

Branch: refs/heads/master
Commit: e43f4527e73cbb5a181ca06f4090ee0dfbfde018
Parents: 190f6e2
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Fri May 16 11:37:39 2014 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Fri May 16 11:37:39 2014 +0100

----------------------------------------------------------------------
 .../apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e43f4527/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
index 8f5f9dd..6845241 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
@@ -71,7 +71,8 @@ public class JAXRSInInterceptor extends AbstractPhaseInterceptor<Message>
{
         final Exchange exchange = message.getExchange(); 
         
         exchange.put(Message.REST_MESSAGE, Boolean.TRUE);
-        if (exchange.get(Response.class) == null) {
+        Response response = exchange.get(Response.class);
+        if (response == null) {
             try {
                 processRequest(message, exchange);
                 if (exchange.isOneWay()) {
@@ -84,9 +85,9 @@ public class JAXRSInInterceptor extends AbstractPhaseInterceptor<Message>
{
             }
         }
         
-        Response r = exchange.get(Response.class);
-        if (r != null) {
-            createOutMessage(message, r);
+        response = exchange.get(Response.class);
+        if (response != null) {
+            createOutMessage(message, response);
             message.getInterceptorChain().doInterceptStartingAt(message,
                                                                 OutgoingChainInterceptor.class.getName());
         }


Mime
View raw message