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

[alexhall at mulgara.org]

Author: alexhall
Date: 2009-02-18 12:16:57 -0800 (Wed, 18 Feb 2009)
New Revision: 1524

Modified:
   trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java
Log:
Eliminate another possible infinite loop when canonicalizing graph URI's.

Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java	2009-02-18 20:10:30 UTC (rev 1523)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java	2009-02-18 20:16:57 UTC (rev 1524)
@@ -206,7 +206,10 @@
         Node aliasedNode = getCanonicalAlias(graphURI);
         if (aliasedNode != null) {
           long aliasedGraph = systemResolver.localize(aliasedNode);
-          return findModelResolverFactory(aliasedGraph);
+          // In some situations, a canonical alias can localize back to the original graph node.
+          if (aliasedGraph != graph) {
+            return findModelResolverFactory(aliasedGraph);
+          }
         }
 
         // test the graph URI against the current server