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 2017/01/22 20:09:40 UTC
[03/10] jena git commit: Remove initializer - it can block
initialization.
Remove initializer - it can block initialization.
Otherwise, initialization code can not assume Node is initialied
and so their internal constand Nodes can be null.
NodeFactory has an initializer call.
Var (which created Vars which are Nodes) has an initializer call.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0e8c0324
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0e8c0324
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0e8c0324
Branch: refs/heads/master
Commit: 0e8c032422dd3180a7b84e03a0dd6b9eccedf981
Parents: 843298c
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jan 19 15:31:36 2017 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jan 19 15:31:36 2017 +0000
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/sparql/core/Var.java | 4 ++++
jena-core/src/main/java/org/apache/jena/graph/Node.java | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0e8c0324/jena-arq/src/main/java/org/apache/jena/sparql/core/Var.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/Var.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/Var.java
index a902d78..59779a8 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/Var.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/Var.java
@@ -28,11 +28,15 @@ import org.apache.jena.sparql.ARQConstants ;
import org.apache.jena.sparql.ARQInternalErrorException ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.expr.ExprVar ;
+import org.apache.jena.system.JenaSystem;
/** A SPARQL variable */
public class Var extends Node_Variable
{
+ // This class create Nodes (as Vars)
+ static { JenaSystem.init(); }
+
/* Variable used to indicate "don't bind"
* Each use is unique.
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/0e8c0324/jena-core/src/main/java/org/apache/jena/graph/Node.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node.java b/jena-core/src/main/java/org/apache/jena/graph/Node.java
index 2ad3eab..67c7dab 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node.java
@@ -27,7 +27,6 @@ import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.graph.impl.LiteralLabel ;
import org.apache.jena.shared.JenaException ;
import org.apache.jena.shared.PrefixMapping ;
-import org.apache.jena.system.JenaSystem;
import org.apache.jena.system.Serializer;
/**
@@ -40,8 +39,6 @@ import org.apache.jena.system.Serializer;
public abstract class Node implements Serializable {
- static { JenaSystem.init(); }
-
final protected Object label;
static final int THRESHOLD = 10000;