Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 115f420f4 -> 20448838d
[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/20448838 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/20448838 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/20448838 Branch: refs/heads/3.0.x-fixes Commit: 20448838d3ce5db6366eae4e4c7c60d0ec50f2c6 Parents: 115f420 Author: Sergey Beryozkin <[email protected]> Authored: Tue Apr 21 13:29:16 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Apr 21 13:34:00 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/20448838/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 10ed509..304f644 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 @@ -1851,11 +1851,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) {
