svn commit: r921225 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java

[dkulp]

Author: dkulp
Date: Wed Mar 10 04:03:24 2010
New Revision: 921225

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

........
  r921223 | dkulp | 2010-03-09 22:59:23 -0500 (Tue, 09 Mar 2010) | 2 lines
  
  [CXF-2702]Fix issue with auth provider and non-cxf usage
  Patch from S. Ali Tokmen applied
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 10 04:03:24 2010
@@ -1 +1 @@
-/cxf/trunk:920741,920752,921014
+/cxf/trunk:920741,920752,921014,921223

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

Modified: 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java?rev=921225&r1=921224&r2=921225&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
 Wed Mar 10 04:03:24 2010
@@ -79,8 +79,11 @@ public class CXFAuthenticator extends Au
                 //ignore
             }
         }
-        if (auth == null) {
-            Message m = PhaseInterceptorChain.getCurrentMessage();
+        if (auth != null) {
+            return auth;
+        }
+        Message m = PhaseInterceptorChain.getCurrentMessage();
+        if (m != null) {
             Exchange exchange = m.getExchange();
             Conduit conduit = exchange.getConduit(m);
             if (conduit instanceof HTTPConduit) {
@@ -102,6 +105,8 @@ public class CXFAuthenticator extends Au
                 }
             }
         }
+        // else PhaseInterceptorChain.getCurrentMessage() is null,
+        // this HTTP call has therefore not been generated by CXF
         return auth;
     }
 }