You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/08/23 03:55:44 UTC
svn commit: r568801 -
/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
Author: elecharny
Date: Wed Aug 22 18:55:43 2007
New Revision: 568801
URL: http://svn.apache.org/viewvc?rev=568801&view=rev
Log:
Modified the code to be compatible with MINA 1.1.2
Modified:
directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java?rev=568801&r1=568800&r2=568801&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java (original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java Wed Aug 22 18:55:43 2007
@@ -31,6 +31,9 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
import javax.naming.Context;
import javax.naming.NamingException;
@@ -82,11 +85,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
-import edu.emory.mathcs.backport.java.util.concurrent.Executors;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-
-
/**
* Adds additional bootstrapping for server socket listeners when firing
* up the server.
@@ -268,7 +266,7 @@
dsc.logicExecutor.shutdown();
for (;;) {
try {
- if (dsc.logicExecutor.awaitTermination(Integer.MAX_VALUE, TimeUnit.DAYS)) {
+ if (dsc.logicExecutor.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS)) {
break;
}
} catch (InterruptedException e) {
@@ -277,7 +275,7 @@
dsc.ioExecutor.shutdown();
for (;;) {
try {
- if (dsc.ioExecutor.awaitTermination(Integer.MAX_VALUE, TimeUnit.DAYS)) {
+ if (dsc.ioExecutor.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS)) {
break;
}
} catch (InterruptedException e) {