jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [2/3] jena git commit: JENA-1482: Copy change in TDB1 to TDB2
Date Thu, 19 Apr 2018 11:10:44 GMT
JENA-1482: Copy change in TDB1 to TDB2


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d077e2cd
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d077e2cd
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d077e2cd

Branch: refs/heads/master
Commit: d077e2cdf286f2f088f6a35d45244fa2425cc818
Parents: 928e70f
Author: Andy Seaborne <andy@apache.org>
Authored: Thu Apr 19 10:44:14 2018 +0100
Committer: Andy Seaborne <andy@apache.org>
Committed: Thu Apr 19 10:44:14 2018 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/jena/tdb2/solver/BindingTDB.java  | 4 +++-
 .../src/main/java/org/apache/jena/tdb/solver/BindingTDB.java   | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/d077e2cd/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/BindingTDB.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/BindingTDB.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/BindingTDB.java
index 194cb44..810d5cd 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/BindingTDB.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/solver/BindingTDB.java
@@ -120,7 +120,9 @@ public class BindingTDB extends BindingBase
             
             NodeId id = idBinding.get(var) ;
             if ( id == null )
-                return null ; 
+                return null ;
+            if ( NodeId.isDoesNotExist(id) )
+                return null;
             n = nodeTable.getNodeForNodeId(id) ;
             if ( n == null )
                 // But there was to put it in the BindingNodeId. 

http://git-wip-us.apache.org/repos/asf/jena/blob/d077e2cd/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java
index 26a36c9..a80faa0 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/solver/BindingTDB.java
@@ -102,9 +102,9 @@ public class BindingTDB extends BindingBase
         // In case we are inserting known missing nodes. 
         if ( NodeId.isDoesNotExist(id) )
             return null ;
-        
+
         if ( parent == null )
-            return null ; 
+            return null ;
         if ( parent instanceof BindingTDB )
             return ((BindingTDB)parent).getNodeId(var) ;
         return null ;
@@ -120,7 +120,7 @@ public class BindingTDB extends BindingBase
             
             NodeId id = idBinding.get(var) ;
             if ( id == null )
-                return null ; 
+                return null ;
             if ( NodeId.isDoesNotExist(id) )
                 return null;
             n = nodeTable.getNodeForNodeId(id) ;


Mime
View raw message