Maintainence.

wjdckdgns · Nov 13, 2018 · 1b5463f · 1b5463f
1 parent 7251589
commit 1b5463f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
@@ -345,8 +345,7 @@ public ResultSet execSelect() {
         return new ResultSetCheckCondition(rs, this) ;
     }
 
-   private ResultSet execResultSetInner() {
-
+	private ResultSet execResultSetInner() {
         HttpQuery httpQuery = makeHttpQuery();
         httpQuery.setAccept(chooseAcceptHeader(acceptHeader, selectContentType));
         InputStream in = httpQuery.exec();
@@ -383,7 +382,7 @@ private ResultSet execResultSetInner() {
         return result;
     }
 
-   // XXX Move
+    //  XXX Move
     private static String chooseAcceptHeader(String acceptHeader, String contentType) {
         if ( acceptHeader != null )
             return acceptHeader;

diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java
@@ -43,7 +43,7 @@ public class Context {
     /** Create an empty context */
     public Context() {}
 
-    /* Create an empty context, mark it's readonly state */
+    /* Create an empty context, mark its read-only state */
     private Context(boolean readonly) {
         this.readonly = readonly ;
     }

diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
@@ -70,7 +70,7 @@ protected void doCommon(HttpServletRequest request, HttpServletResponse response
             response = action.response ;
             initResponse(request, response) ;
             try {
-                action.startRequest();
+                startRequest(action);
                 execCommonWorker(action) ;
             } catch (QueryCancelledException ex) {
                 // To put in the action timeout, need (1) global, (2) dataset and (3) protocol settings.

diff --git a/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java b/jena-fuseki2/jena-fuseki-main/src/main/java/org/apache/jena/fuseki/main/FusekiServer.java
@@ -389,6 +389,14 @@ public Builder add(String name, DataService dataService) {
             if ( dataAccessPoints.isRegistered(name) )
                 throw new FusekiConfigException("Data service name already registered: "+name);
             DataAccessPoint dap = new DataAccessPoint(name, dataService);
+            addDataAccessPoint(dap);
+            return this;
+        }
+
+        /** Add a {@link DataAccessPoint}. */
+        private Builder addDataAccessPoint(DataAccessPoint dap) {
+            if ( dataAccessPoints.isRegistered(dap.getName()) )
+                throw new FusekiConfigException("Data service name already registered: "+dap.getName());
             dataAccessPoints.register(dap);
             return this;
         }
@@ -411,8 +419,7 @@ public Builder parseConfigFile(String filename) {
 
             // Process services, whether via server ja:services or, if absent, by finding by type.
             List<DataAccessPoint> x = FusekiConfig.servicesAndDatasets(model);
-            // Unbundle so that they accumulate.
-            x.forEach(dap->add(dap.getName(), dap.getDataService()));
+            x.forEach(dap->addDataAccessPoint(dap));
             return this;
         }
 

diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
@@ -89,7 +89,7 @@ public class ActionDatasets extends ActionContainerItem {
     private static DatasetGraphTransaction systemDSG = SystemState.getDatasetGraph() ; 
 
     static private Property pServiceName = FusekiVocab.pServiceName ;
-    static private Property pStatus = FusekiVocab.pStatus ;
+    //static private Property pStatus = FusekiVocab.pStatus ;
 
     private static final String paramDatasetName    = "dbName" ;
     private static final String paramDatasetType    = "dbType" ;