Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2985E200B10 for ; Wed, 11 May 2016 15:02:05 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2844D1602BE; Wed, 11 May 2016 13:02:05 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5CD40160A13 for ; Wed, 11 May 2016 15:02:04 +0200 (CEST) Received: (qmail 12294 invoked by uid 500); 11 May 2016 13:02:03 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 12242 invoked by uid 99); 11 May 2016 13:02:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 May 2016 13:02:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 576D8DFF32; Wed, 11 May 2016 13:02:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andy@apache.org To: commits@jena.apache.org Date: Wed, 11 May 2016 13:02:04 -0000 Message-Id: <92d0bc9ea1754693a69032dc121b1f67@git.apache.org> In-Reply-To: <3400a06b084943fc845b4a0a8115d402@git.apache.org> References: <3400a06b084943fc845b4a0a8115d402@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] jena git commit: JENA-1177: Allow null after create. Use mem graph maker as default. archived-at: Wed, 11 May 2016 13:02:05 -0000 JENA-1177: Allow null after create. Use mem graph maker as default. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4c9315fc Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4c9315fc Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4c9315fc Branch: refs/heads/master Commit: 4c9315fc4afdd30229efa3a3bbe32d03da6adf62 Parents: 009b321 Author: Andy Seaborne Authored: Wed May 11 13:53:58 2016 +0100 Committer: Andy Seaborne Committed: Wed May 11 13:53:58 2016 +0100 ---------------------------------------------------------------------- .../org/apache/jena/sparql/core/DatasetGraphMapLink.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/4c9315fc/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMapLink.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMapLink.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMapLink.java index e8b35bb..4835aed 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMapLink.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMapLink.java @@ -25,7 +25,6 @@ import java.util.Map ; import org.apache.jena.graph.Graph ; import org.apache.jena.graph.Node ; import org.apache.jena.query.ReadWrite ; -import org.apache.jena.sparql.ARQException ; import org.apache.jena.sparql.core.DatasetGraphFactory.GraphMaker ; /** Implementation of a DatasetGraph as an extensible set of graphs. @@ -86,7 +85,7 @@ public class DatasetGraphMapLink extends DatasetGraphCollection * but new graphs are created in memory. */ private DatasetGraphMapLink(DatasetGraph dsg) { - this(dsg, DatasetGraphFactory.memGraphMaker) ; + this(dsg, DatasetGraphFactory.graphMakerMem) ; } private DatasetGraphMapLink(Graph dftGraph, GraphMaker graphMaker) { @@ -113,7 +112,7 @@ public class DatasetGraphMapLink extends DatasetGraphCollection */ public DatasetGraphMapLink(Graph dftGraph) { this.defaultGraph = dftGraph ; - this.graphMaker = DatasetGraphFactory.graphMakerNull ; + this.graphMaker = DatasetGraphFactory.graphMakerMem ; } // ---- @@ -152,10 +151,7 @@ public class DatasetGraphMapLink extends DatasetGraphCollection * Return null for "nothing created as a graph" */ protected Graph getGraphCreate() { - Graph g = graphMaker.create() ; - if ( g == null ) - throw new ARQException("Can't make new graphs") ; - return g ; + return graphMaker.create() ; } @Override