You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2020/07/09 09:46:57 UTC
svn commit: r1879691 - in /jackrabbit/branches/2.20: ./
jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Iterators.java
Author: reschke
Date: Thu Jul 9 09:46:57 2020
New Revision: 1879691
URL: http://svn.apache.org/viewvc?rev=1879691&view=rev
Log:
JCR-4603: spi-commons: Iterators - incorrect method signature (merged r1879325 into 2.20)
Modified:
jackrabbit/branches/2.20/ (props changed)
jackrabbit/branches/2.20/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Iterators.java
Propchange: jackrabbit/branches/2.20/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1879325
Modified: jackrabbit/branches/2.20/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Iterators.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Iterators.java?rev=1879691&r1=1879690&r2=1879691&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Iterators.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/iterator/Iterators.java Thu Jul 9 09:46:57 2020
@@ -99,7 +99,7 @@ public final class Iterators {
* @return
*/
@SuppressWarnings("unchecked")
- public static <T> Iterator<T> iteratorChain(Collection<? extends T> iterators) {
+ public static <T> Iterator<T> iteratorChain(Collection<Iterator<? extends T>> iterators) {
return new IteratorChain(iterators);
}