Return-Path: X-Original-To: apmail-clerezza-commits-archive@www.apache.org Delivered-To: apmail-clerezza-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C805C1037E for ; Wed, 4 Dec 2013 14:50:24 +0000 (UTC) Received: (qmail 45668 invoked by uid 500); 4 Dec 2013 14:50:23 -0000 Delivered-To: apmail-clerezza-commits-archive@clerezza.apache.org Received: (qmail 45633 invoked by uid 500); 4 Dec 2013 14:50:23 -0000 Mailing-List: contact commits-help@clerezza.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@clerezza.apache.org Delivered-To: mailing list commits@clerezza.apache.org Received: (qmail 45610 invoked by uid 99); 4 Dec 2013 14:50:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Dec 2013 14:50:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 94883B1E8; Wed, 4 Dec 2013 14:50:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: reto@apache.org To: commits@clerezza.apache.org Date: Wed, 04 Dec 2013 14:50:19 -0000 Message-Id: <077205332aab4c38b9be59e84d2531f2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: replaced tabs with spaces Updated Branches: refs/heads/master ec828771d -> a7d9d0fc3 replaced tabs with spaces Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/00369916 Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/00369916 Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/00369916 Branch: refs/heads/master Commit: 00369916671b32841096c32d0f7a10a802f28957 Parents: ec82877 Author: retobg Authored: Wed Dec 4 12:28:14 2013 +0100 Committer: retobg Committed: Wed Dec 4 12:28:14 2013 +0100 ---------------------------------------------------------------------- .../rdf/jena/sparql/JenaSparqlEngine.java | 90 ++++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/clerezza/blob/00369916/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java ---------------------------------------------------------------------- diff --git a/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java b/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java index 6ccbc8c..5dfe7a9 100644 --- a/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java +++ b/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java @@ -52,35 +52,35 @@ import com.hp.hpl.jena.update.UpdateRequest; */ public class JenaSparqlEngine implements QueryEngine { - // ------------------------------------------------------------------------ - // Implementing QueryEngine - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ + // Implementing QueryEngine + // ------------------------------------------------------------------------ - @Override - public Object execute(TcManager tcManager, TripleCollection defaultGraph, - final Query query) { - return execute(tcManager, defaultGraph, query.toString()); - } + @Override + public Object execute(TcManager tcManager, TripleCollection defaultGraph, + final Query query) { + return execute(tcManager, defaultGraph, query.toString()); + } - @Override - public Object execute(TcManager tcManager, TripleCollection defaultGraph, - final String query) { - final Dataset dataset = new TcDataset(tcManager, defaultGraph); + @Override + public Object execute(TcManager tcManager, TripleCollection defaultGraph, + final String query) { + final Dataset dataset = new TcDataset(tcManager, defaultGraph); - // Missing permission (java.lang.RuntimePermission getClassLoader) - // when calling QueryFactory.create causes ExceptionInInitializerError - // to be thrown. - // QueryExecutionFactory.create requires - // (java.io.FilePermission [etc/]location-mapping.* read) - // Thus, they are placed within doPrivileged - QueryExecution qexec = AccessController - .doPrivileged(new PrivilegedAction() { + // Missing permission (java.lang.RuntimePermission getClassLoader) + // when calling QueryFactory.create causes ExceptionInInitializerError + // to be thrown. + // QueryExecutionFactory.create requires + // (java.io.FilePermission [etc/]location-mapping.* read) + // Thus, they are placed within doPrivileged + QueryExecution qexec = AccessController + .doPrivileged(new PrivilegedAction() { - @Override - public QueryExecution run() { + @Override + public QueryExecution run() { try { com.hp.hpl.jena.query.Query jenaQuery = QueryFactory - .create(query); + .create(query); if (jenaQuery.isUnknownType()) { return null; } @@ -89,32 +89,32 @@ public class JenaSparqlEngine implements QueryEngine { return null; } - } - }); + } + }); if (qexec == null) { return executeUpdate(dataset, query); } //TODO check with rather than trial and error: if (qexec.getQuery().isSelectType()) { - try { - try { - return new ResultSetWrapper(qexec.execSelect()); - } catch (QueryExecException e) { - try { - return Boolean.valueOf(qexec.execAsk()); - } catch (QueryExecException e2) { - try { - return new JenaGraphAdaptor(qexec.execDescribe() - .getGraph()).getGraph(); - } catch (QueryExecException e3) { - return new JenaGraphAdaptor(qexec.execConstruct() - .getGraph()).getGraph(); - } - } - } - } finally { - qexec.close(); - } - } + try { + try { + return new ResultSetWrapper(qexec.execSelect()); + } catch (QueryExecException e) { + try { + return Boolean.valueOf(qexec.execAsk()); + } catch (QueryExecException e2) { + try { + return new JenaGraphAdaptor(qexec.execDescribe() + .getGraph()).getGraph(); + } catch (QueryExecException e3) { + return new JenaGraphAdaptor(qexec.execConstruct() + .getGraph()).getGraph(); + } + } + } + } finally { + qexec.close(); + } + } private Object executeUpdate(Dataset dataset, String query) { GraphStore graphStore = GraphStoreFactory.create(dataset) ;