You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2010/06/04 10:33:59 UTC
svn commit: r951321 -
/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JoinIterator.java
Author: felixk
Date: Fri Jun 4 08:33:59 2010
New Revision: 951321
URL: http://svn.apache.org/viewvc?rev=951321&view=rev
Log:
"iterators" can't be null in this place. If so the IllegalArgumentException above is thrown.
Modified:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JoinIterator.java
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JoinIterator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JoinIterator.java?rev=951321&r1=951320&r2=951321&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JoinIterator.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JoinIterator.java Fri Jun 4 08:33:59 2010
@@ -56,13 +56,8 @@ public class JoinIterator implements Ite
throw new IllegalArgumentException( I18n.err( I18n.ERR_04397 ) );
}
- if ( iterators != null )
- {
- this.iterators = new Iterator[ iterators.length ];
- System.arraycopy( iterators, 0, this.iterators, 0, iterators.length );
- } else {
- this.iterators = null;
- }
+ this.iterators = new Iterator[ iterators.length ];
+ System.arraycopy( iterators, 0, this.iterators, 0, iterators.length );
this.index = 0;
}