You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2015/11/04 09:28:55 UTC

svn commit: r1712498 - in /james/project/trunk: mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java pom.xml

Author: aduprat
Date: Wed Nov  4 08:28:55 2015
New Revision: 1712498

URL: http://svn.apache.org/viewvc?rev=1712498&view=rev
Log:
JAMES-1633 Fails when tests are locked. Contributed by Duprat <an...@gmail.com>

Modified:
    james/project/trunk/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
    james/project/trunk/pom.xml

Modified: james/project/trunk/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java?rev=1712498&r1=1712497&r2=1712498&view=diff
==============================================================================
--- james/project/trunk/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java (original)
+++ james/project/trunk/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/quota/InMemoryCurrentQuotaManager.java Wed Nov  4 08:28:55 2015
@@ -19,10 +19,12 @@
 
 package org.apache.james.mailbox.inmemory.quota;
 
-import com.google.common.base.Preconditions;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicLong;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.model.QuotaRoot;
@@ -31,10 +33,10 @@ import org.apache.james.mailbox.store.qu
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.atomic.AtomicLong;
+import com.google.common.base.Preconditions;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 
 @Singleton
 public class InMemoryCurrentQuotaManager implements StoreCurrentQuotaManager {

Modified: james/project/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/pom.xml?rev=1712498&r1=1712497&r2=1712498&view=diff
==============================================================================
--- james/project/trunk/pom.xml (original)
+++ james/project/trunk/pom.xml Wed Nov  4 08:28:55 2015
@@ -789,6 +789,8 @@
                     <configuration>
                         <argLine>-Xms256m -Xmx512m</argLine>
                         <forkMode>always</forkMode>
+                        <!-- Fail tests longer than 30 minutes, prevent form random locking tests -->
+                        <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
                     </configuration>
                 </plugin>
                 <plugin>



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