Repository: cxf Updated Branches: refs/heads/master f74e2e060 -> 9bcc593c1
[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/9bcc593c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9bcc593c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9bcc593c Branch: refs/heads/master Commit: 9bcc593c140f656ea79ab6da23cd76eaf2274576 Parents: f74e2e0 Author: Sergey Beryozkin <[email protected]> Authored: Tue Apr 21 13:29:16 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Apr 21 13:29:16 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/9bcc593c/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 92b1e44..a6ebaa7 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 @@ -1848,11 +1848,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) {
