cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6361] Reverting the 'fix'
Date Tue, 21 Apr 2015 12:35:01 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 1cee0a36b -> fe7f3d174


[CXF-6361] Reverting the 'fix'


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

Branch: refs/heads/2.7.x-fixes
Commit: fe7f3d1743a95ae63d8928d4841556fee12b744e
Parents: 1cee0a3
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Tue Apr 21 13:29:16 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Tue Apr 21 13:34:42 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/cxf/transport/http/HTTPConduit.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/fe7f3d17/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 00c2c36..74a738b 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -1822,11 +1822,11 @@ public abstract class HTTPConduit
             // See if we are being redirected in a loop as best we can,
             // using string equality on URL.
             boolean invalidLoopDetected = newURL.equals(lastURL); 
-            if (invalidLoopDetected) {
+            if (!invalidLoopDetected) {
                 // this URI was used sometime earlier
                 Integer maxSameURICount = PropertyUtils.getInteger(message, AUTO_REDIRECT_MAX_SAME_URI_COUNT);
-                if (maxSameURICount != null && newURLCount <= maxSameURICount)
{
-                    invalidLoopDetected = false;
+                if (maxSameURICount == null || newURLCount > maxSameURICount) {
+                    invalidLoopDetected = true;
                 }
             }
             if (invalidLoopDetected) {


Mime
View raw message