You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/08/12 22:38:20 UTC

svn commit: r1372194 - /jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphOps.java

Author: andy
Date: Sun Aug 12 20:38:20 2012
New Revision: 1372194

URL: http://svn.apache.org/viewvc?rev=1372194&view=rev
Log:
Include generated dft graph name.

Modified:
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphOps.java

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphOps.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphOps.java?rev=1372194&r1=1372193&r2=1372194&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphOps.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/GraphOps.java Sun Aug 12 20:38:20 2012
@@ -33,7 +33,7 @@ public class GraphOps
     public static boolean containsGraph(DatasetGraph dsg, Node gn)
     {
         // [[DynDS]]
-        if ( Quad.isDefaultGraphExplicit(gn))
+        if ( Quad.isDefaultGraph(gn))
             return true ;
         if ( Quad.isUnionGraph(gn))
             return true ;
@@ -43,8 +43,10 @@ public class GraphOps
     public static Graph getGraph(DatasetGraph dsg, Node gn)
     {
         // [[DynDS]]
-        // Remove when all datasets understand <urn:x-arq:DefaultGraph> and <urn:x-arq:UnionGraph> 
-        if ( Quad.isDefaultGraphExplicit(gn))
+        if ( gn == null )
+            return dsg.getDefaultGraph() ;
+        if ( Quad.isDefaultGraph(gn) )
+            // Explicit or generated.
             return dsg.getDefaultGraph() ;
         if ( Quad.isUnionGraph(gn))
             return unionGraph(dsg) ;