Fixes #6323 - HttpClient requests with redirects gets stuck/never cal…

…ls onComplete() Moved IteratorWrapper in HttpConnectionOverFCGI. Signed-off-by: Simone Bordet <[email protected]>
jetty · May 30, 2021 · 0aa6720 · 0aa6720
1 parent 9218a2b
commit 0aa6720
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
@@ -336,32 +336,4 @@ protected boolean onExpired(HttpChannel channel)
             return false;
         }
     }
-
-    protected static final class IteratorWrapper<T> implements Iterator<T>
-    {
-        private final Iterator<? extends T> iterator;
-
-        public IteratorWrapper(Iterator<? extends T> iterator)
-        {
-            this.iterator = iterator;
-        }
-
-        @Override
-        public boolean hasNext()
-        {
-            return iterator.hasNext();
-        }
-
-        @Override
-        public T next()
-        {
-            return iterator.next();
-        }
-
-        @Override
-        public void remove()
-        {
-            iterator.remove();
-        }
-    }
 }
diff --git a/.../fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java b/.../fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java
@@ -519,4 +519,32 @@ private void noChannel(int request)
                 LOG.debug("Channel not found for request {}", request);
         }
     }
+
+    private static final class IteratorWrapper<T> implements Iterator<T>
+    {
+        private final Iterator<? extends T> iterator;
+
+        private IteratorWrapper(Iterator<? extends T> iterator)
+        {
+            this.iterator = iterator;
+        }
+
+        @Override
+        public boolean hasNext()
+        {
+            return iterator.hasNext();
+        }
+
+        @Override
+        public T next()
+        {
+            return iterator.next();
+        }
+
+        @Override
+        public void remove()
+        {
+            iterator.remove();
+        }
+    }
 }