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 2020/05/02 11:38:34 UTC
[jena] branch master updated: JENA-1837: Default for
maxBasicQueries; protect against bad config
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/master by this push:
new c4f1984 JENA-1837: Default for maxBasicQueries; protect against bad config
new 2e0dfc4 Merge pull request #740 from afs/jena1837-part2
c4f1984 is described below
commit c4f198482f2de8fb4a84ccd72d273d4f048a62bb
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri May 1 16:12:42 2020 +0100
JENA-1837: Default for maxBasicQueries; protect against bad config
---
.../src/main/java/org/apache/jena/query/text/TextIndexConfig.java | 6 +++---
.../src/main/java/org/apache/jena/query/text/TextIndexLucene.java | 4 ++--
.../apache/jena/query/text/assembler/TextIndexLuceneAssembler.java | 7 ++++++-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexConfig.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexConfig.java
index 57f02a1..92711e5 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexConfig.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexConfig.java
@@ -27,7 +27,7 @@ public class TextIndexConfig {
Analyzer queryAnalyzer;
String queryParser;
boolean multilingualSupport;
- int maxBasicQueries;
+ int maxBasicQueries = 1024;
boolean valueStored;
boolean ignoreIndexErrors;
@@ -54,11 +54,11 @@ public class TextIndexConfig {
public void setQueryAnalyzer(Analyzer queryAnalyzer) {
this.queryAnalyzer = queryAnalyzer;
}
-
+
public String getQueryParser() {
return ((queryParser != null) ? queryParser : "QueryParser");
}
-
+
public void setQueryParser(String queryParser) {
this.queryParser = queryParser;
}
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
index d81e4de..78fdc83 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
@@ -109,8 +109,8 @@ public class TextIndexLucene implements TextIndex {
private final Analyzer queryAnalyzer ;
private final String queryParserType ;
private final FieldType ftText ;
- private final FieldType ftTextNotStored ; // used for lang derived fields
- private final FieldType ftTextStoredNoIndex ; // used for lang derived fields
+ private final FieldType ftTextNotStored ; // used for lang derived fields
+ private final FieldType ftTextStoredNoIndex ; // used for lang derived fields
private final boolean isMultilingual ;
private final int maxBasicQueries ;
private final boolean ignoreIndexErrors ;
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
index 472aa0f..13924dd 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
@@ -100,7 +100,12 @@ public class TextIndexLuceneAssembler extends AssemblerBase {
if (! mbqNode.isLiteral()) {
throw new TextIndexException("text:maxBasicQueries property must be a int : " + mbqNode);
}
- maxBasicQueries = mbqNode.asLiteral().getInt();
+ try {
+ maxBasicQueries = mbqNode.asLiteral().getInt();
+ } catch (RuntimeException ex) {
+ // Problems with the integer.
+ throw new TextIndexException("text:maxBasicQueries property must be a int : " + mbqNode+ "("+ex.getMessage()+")");
+ }
}
// define any property lists for text:query