james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r1079285 - in /james/mailbox/trunk: pom.xml store/pom.xml store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
Date Tue, 08 Mar 2011 08:02:16 GMT
Author: felixk
Date: Tue Mar  8 08:02:16 2011
New Revision: 1079285

URL: http://svn.apache.org/viewvc?rev=1079285&view=rev
Log:
Remove commons-collections from dependencyManagement and and use trivial implementation to
get emtpy iterator.
Thanks Norman for pointing.

Modified:
    james/mailbox/trunk/pom.xml
    james/mailbox/trunk/store/pom.xml
    james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java

Modified: james/mailbox/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/pom.xml?rev=1079285&r1=1079284&r2=1079285&view=diff
==============================================================================
--- james/mailbox/trunk/pom.xml (original)
+++ james/mailbox/trunk/pom.xml Tue Mar  8 08:02:16 2011
@@ -542,11 +542,6 @@
         Start Commons
       -->
       <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>${version.commons-collections}</version>
-      </dependency>
-      <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
         <version>${version.commons-lang}</version>

Modified: james/mailbox/trunk/store/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/pom.xml?rev=1079285&r1=1079284&r2=1079285&view=diff
==============================================================================
--- james/mailbox/trunk/store/pom.xml (original)
+++ james/mailbox/trunk/store/pom.xml Tue Mar  8 08:02:16 2011
@@ -53,10 +53,6 @@
       <artifactId>lucene-analyzers</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java?rev=1079285&r1=1079284&r2=1079285&view=diff
==============================================================================
--- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
(original)
+++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
Tue Mar  8 08:02:16 2011
@@ -38,7 +38,6 @@ import javax.mail.Flags;
 import javax.mail.Flags.Flag;
 import javax.mail.util.SharedFileInputStream;
 
-import org.apache.commons.collections.iterators.EmptyIterator;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxListener;
 import org.apache.james.mailbox.MailboxSession;
@@ -486,10 +485,9 @@ public abstract class StoreMessageManage
                 iterator = it;
             }
 
-            @SuppressWarnings("unchecked")
             public Iterator<MessageResult> getIterator() {
         	if (iterator == null) {
-        	    return (Iterator<MessageResult>)EmptyIterator.INSTANCE;
+        	    iterator = new ResultIterator<Id>(null, null);
         	}
                 return iterator;
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message