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 2015/12/17 14:46:03 UTC
jena git commit: JENA-1088: Don't trim dataset name
Repository: jena
Updated Branches:
refs/heads/master 393f075c4 -> 7248f19b5
JENA-1088: Don't trim dataset name
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7248f19b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7248f19b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7248f19b
Branch: refs/heads/master
Commit: 7248f19b59a2ae61cb133b8475cb8215ebbe01a2
Parents: 393f075
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Dec 17 13:45:50 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Dec 17 13:45:50 2015 +0000
----------------------------------------------------------------------
.../apache/jena/fuseki/mgt/ActionDatasets.java | 27 ++++++++------------
1 file changed, 10 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7248f19b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
index 217cb7f..75ae3a4 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
@@ -167,26 +167,19 @@ public class ActionDatasets extends ActionContainerItem {
action.log.warn(format("[%d] Service name '%s' is not a string", action.id, FmtUtils.stringForRDFNode(object)));
String datasetPath ;
- {
- // As provided.
- String datasetNameOrig = object.getLexicalForm() ;
+ { // Check the name provided.
+ String datasetName = object.getLexicalForm() ;
// ---- Check and canonicalize name.
- if ( datasetNameOrig.isEmpty() )
+ if ( datasetName.isEmpty() )
ServletOps.error(HttpSC.BAD_REQUEST_400, "Empty dataset name") ;
- if ( StringUtils.isBlank(datasetNameOrig) )
- // Get logged
- ServletOps.error(HttpSC.BAD_REQUEST_400, format("Whitespace dataset name: '%s'", datasetNameOrig)) ;
-
- String datasetNameTrimmed = datasetNameOrig.trim() ;
- if ( ! datasetNameTrimmed.equals(datasetNameOrig) )
- action.log.warn(format("[%d] Trimming white space: '%s' -> '%s'", action.id, datasetNameOrig, datasetNameTrimmed)) ;
- if ( datasetNameTrimmed.contains(" ") )
- ServletOps.error(HttpSC.BAD_REQUEST_400, format("Bad dataset name (contains spaces) '%s'",datasetNameOrig)) ;
- if ( datasetNameTrimmed.equals("/") )
- ServletOps.error(HttpSC.BAD_REQUEST_400, format("Bad dataset name '%s'",datasetNameOrig)) ;
-
- datasetPath = DataAccessPoint.canonical(datasetNameTrimmed) ;
+ if ( StringUtils.isBlank(datasetName) )
+ ServletOps.error(HttpSC.BAD_REQUEST_400, format("Whitespace dataset name: '%s'", datasetName)) ;
+ if ( datasetName.contains(" ") )
+ ServletOps.error(HttpSC.BAD_REQUEST_400, format("Bad dataset name (contains spaces) '%s'",datasetName)) ;
+ if ( datasetName.equals("/") )
+ ServletOps.error(HttpSC.BAD_REQUEST_400, format("Bad dataset name '%s'",datasetName)) ;
+ datasetPath = DataAccessPoint.canonical(datasetName) ;
}
action.log.info(format("[%d] Create database : name = %s", action.id, datasetPath)) ;
// System.err.println("'"+datasetPath+"'") ;