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 2018/06/11 20:29:15 UTC

jena git commit: Remove pointless method calls. Fix typo

Repository: jena
Updated Branches:
  refs/heads/master f0b052216 -> 0dfb21b87


Remove pointless method calls. Fix typo


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

Branch: refs/heads/master
Commit: 0dfb21b87520b804ac49be24cc2651b5805a5e73
Parents: f0b0522
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jun 11 21:29:05 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jun 11 21:29:05 2018 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/jena/tdb2/lib/TupleLib.java         | 4 +---
 .../org/apache/jena/tdb2/store/nodetable/NodeTableCache.java     | 2 +-
 jena-tdb/src/main/java/org/apache/jena/tdb/lib/TupleLib.java     | 3 ---
 3 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/0dfb21b8/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/lib/TupleLib.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/lib/TupleLib.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/lib/TupleLib.java
index c3d1098..ef750e9 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/lib/TupleLib.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/lib/TupleLib.java
@@ -88,10 +88,8 @@ public class TupleLib {
             throw new InternalErrorException("Invalid id node for subject (null node): " + fmt(s, p, o));
 
         Node pNode = nodeTable.getNodeForNodeId(p);
-        if ( pNode == null ) {
-            nodeTable.getNodeForNodeId(p);
+        if ( pNode == null )
             throw new InternalErrorException("Invalid id node for predicate (null node): " + fmt(s, p, o));
-        }
 
         Node oNode = nodeTable.getNodeForNodeId(o);
         if ( oNode == null )

http://git-wip-us.apache.org/repos/asf/jena/blob/0dfb21b8/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableCache.java
----------------------------------------------------------------------
diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableCache.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableCache.java
index c0f30ce..707138d 100644
--- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableCache.java
+++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableCache.java
@@ -185,7 +185,7 @@ public class NodeTableCache implements NodeTable {
             return n ;
 
         synchronized (lock) {
-            // Lock to update two caches consisently.
+            // Lock to update two caches consistently.
             // Verify cache miss
             n = cacheLookup(id) ;
             if ( n != null )

http://git-wip-us.apache.org/repos/asf/jena/blob/0dfb21b8/jena-tdb/src/main/java/org/apache/jena/tdb/lib/TupleLib.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/lib/TupleLib.java b/jena-tdb/src/main/java/org/apache/jena/tdb/lib/TupleLib.java
index dd42a67..015966c 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/lib/TupleLib.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/lib/TupleLib.java
@@ -99,10 +99,7 @@ public class TupleLib
 
         Node pNode = nodeTable.getNodeForNodeId(p) ;
         if ( pNode == null )
-        {
-            nodeTable.getNodeForNodeId(p) ;
             throw new InternalErrorException("Invalid id node for predicate (null node): "+fmt(s,p,o)) ;
-        }
         
         Node oNode = nodeTable.getNodeForNodeId(o) ;
         if ( oNode == null )