[Mulgara-svn] r521 - branches/nw-interface/src/jar/query/java/org/mulgara/connection

[pag at mulgara.org]

Author: pag
Date: 2007-11-06 15:54:35 -0600 (Tue, 06 Nov 2007)
New Revision: 521

Modified:
   branches/nw-interface/src/jar/query/java/org/mulgara/connection/ConnectionFactory.java
Log:
Fixed local connection URIs. Reduced redundancy in the close() method.

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/connection/ConnectionFactory.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/connection/ConnectionFactory.java	2007-11-06 21:45:44 UTC (rev 520)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/connection/ConnectionFactory.java	2007-11-06 21:54:35 UTC (rev 521)
@@ -16,9 +16,11 @@
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.log4j.Logger;
 import org.mulgara.query.QueryException;
@@ -130,8 +132,9 @@
    * Close all connections served by this factory. Exceptions are logged, but not acted on.
    */
   public void closeAll() {
-    safeCloseAll(cacheOnUri.values());
-    safeCloseAll(cacheOnSession.values());
+    Set<SessionConnection> connectionsToClose = new HashSet<SessionConnection>(cacheOnSession.values());
+    connectionsToClose.addAll(cacheOnUri.values());
+    safeCloseAll(connectionsToClose);
   }
 
 
@@ -190,7 +193,7 @@
     for (String protocol: PROTOCOLS) {
       for (String alias: LOCALHOSTS) {
         try {
-          URI uri = new URI(protocol, alias, path);
+          URI uri = new URI(protocol, alias, path, null);
           cacheOnUri.put(uri, connection);
         } catch (URISyntaxException e) {
           logger.error("Unable to create a localhost alias URI.");