[Mulgara-svn] r1360 - trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed

[ronald at mulgara.org]

Author: ronald
Date: 2008-10-23 06:13:00 -0700 (Thu, 23 Oct 2008)
New Revision: 1360

Modified:
   trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/NetworkDelegator.java
Log:
Handle null server-uri (such as whenever mulgara is not started using the
EmbeddedMulgaraServer).

Modified: trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/NetworkDelegator.java
===================================================================
--- trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/NetworkDelegator.java	2008-10-23 13:12:54 UTC (rev 1359)
+++ trunk/src/jar/resolver-distributed/java/org/mulgara/resolver/distributed/NetworkDelegator.java	2008-10-23 13:13:00 UTC (rev 1360)
@@ -280,7 +280,8 @@
     String host = modelUri.getHost();
     if (ServerInfo.getHostnameAliases().contains(host)) {
       // on the same machine.  Check if the server is different.
-      if (ServerInfo.getServerURI().getPath().equals(modelUri.getPath())) {
+      URI serverUri = ServerInfo.getServerURI();
+      if (serverUri != null && serverUri.getPath().equals(modelUri.getPath())) {
         throw new ResolverException("Attempt to resolve a local model through the distributed resolver.");
       }
     }