Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-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 29678D4F9 for ; Wed, 29 Aug 2012 15:40:42 +0000 (UTC) Received: (qmail 18398 invoked by uid 500); 29 Aug 2012 15:40:42 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 18370 invoked by uid 500); 29 Aug 2012 15:40:41 -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 18361 invoked by uid 99); 29 Aug 2012 15:40:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Aug 2012 15:40:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Aug 2012 15:40:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A4B7D238890D for ; Wed, 29 Aug 2012 15:39:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1378617 - /jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Date: Wed, 29 Aug 2012 15:39:55 -0000 To: commits@jena.apache.org From: andy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120829153955.A4B7D238890D@eris.apache.org> Author: andy Date: Wed Aug 29 15:39:54 2012 New Revision: 1378617 URL: http://svn.apache.org/viewvc?rev=1378617&view=rev Log: Fix (delay finding the dataset until inside a transaction in case dynamic datasets applies.) Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1378617&r1=1378616&r2=1378617&view=diff ============================================================================== --- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java (original) +++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Wed Aug 29 15:39:54 2012 @@ -74,11 +74,10 @@ public abstract class SPARQL_REST extend _target = Target.createNamed(desc.dataset, absUri, gn) ; } - private final Target _target ; + private Target _target = null ; protected HttpActionREST(long id, DatasetRef desc, HttpServletRequest request, HttpServletResponse response, boolean verbose) { super(id, desc, request, response, verbose) ; - _target = targetGraph(request, desc, super.getActiveDSG() ) ; } protected final boolean hasTarget() @@ -90,6 +89,13 @@ public abstract class SPARQL_REST extend protected final Target getTarget() { + // Delayed until inside a transaction. + if ( _target == null ) + { + if ( super.getActiveDSG() == null ) + errorOccurred("Internal error : No action graph (not in a transaction?)") ; + _target = targetGraph(request, super.getDatasetRef(), super.getActiveDSG() ) ; + } return _target ; } } @@ -391,7 +397,9 @@ public abstract class SPARQL_REST extend { // Direct naming or error. uri = request.getRequestURL().toString() ; - //errorBadRequest("Neither default graph nor named graph specificed") ; + if ( request.getRequestURI().equals(desc.name) ) + // No name + errorBadRequest("Neither default graph nor named graph specificed; no direct name") ; } if ( dftGraph )