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 2012/09/08 22:43:02 UTC

svn commit: r1382360 - in /jena/trunk/jena-fuseki: D.nt src-dev/dev/RunFuseki.java src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java

Author: andy
Date: Sat Sep  8 20:43:02 2012
New Revision: 1382360

URL: http://svn.apache.org/viewvc?rev=1382360&view=rev
Log:
Attempt to abort if something goes wrong.

Removed:
    jena/trunk/jena-fuseki/D.nt
Modified:
    jena/trunk/jena-fuseki/src-dev/dev/RunFuseki.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java

Modified: jena/trunk/jena-fuseki/src-dev/dev/RunFuseki.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src-dev/dev/RunFuseki.java?rev=1382360&r1=1382359&r2=1382360&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src-dev/dev/RunFuseki.java (original)
+++ jena/trunk/jena-fuseki/src-dev/dev/RunFuseki.java Sat Sep  8 20:43:02 2012
@@ -53,7 +53,8 @@ public class RunFuseki
     private static void main1()
     {
         FusekiCmd.main(
-                       "--update", "--mem", "/ds"
+                     //"--update", "--mem", "/ds"
+                     "--update", "--loc=DB", "/ds"
                        
                     //"-v", 
                     //"--debug",

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java?rev=1382360&r1=1382359&r2=1382360&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java Sat Sep  8 20:43:02 2012
@@ -63,14 +63,15 @@ public class SPARQL_REST_RW extends SPAR
     {
         DatasetGraph body = parseBody(action) ;
         action.beginWrite() ;
-        boolean existedBefore ;
+        boolean existedBefore = false ;
         try {
             existedBefore = action.getTarget().exists() ; 
             if ( existedBefore )
                 clearGraph(action.getTarget()) ;
             addDataInto(body.getDefaultGraph(), action) ;
             action.commit() ;
-        } finally { action.endWrite() ; }
+        } catch (RuntimeException ex) { action.abort() ; errorOccurred(ex.getMessage()) ; return ; }
+        finally { action.endWrite() ; }
         // Differentiate: 201 Created or 204 No Content 
         if ( existedBefore )
             SPARQL_ServletBase.successNoContent(action) ;