You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2021/03/09 21:28:35 UTC
[jspwiki] 01/03: Ensure search provider can be readed as an Env
property on docker images
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 5133593c558c5884274c691931beb6eb15108b6b
Author: Juan Pablo Santos RodrÃguez <ju...@gmail.com>
AuthorDate: Tue Mar 9 22:25:21 2021 +0100
Ensure search provider can be readed as an Env property on docker images
---
.../src/main/java/org/apache/wiki/search/DefaultSearchManager.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
index dbefafa..e31ab32 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
@@ -40,6 +40,7 @@ import org.apache.wiki.pages.PageManager;
import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.references.ReferenceManager;
import org.apache.wiki.util.ClassUtil;
+import org.apache.wiki.util.TextUtil;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -235,7 +236,8 @@ public class DefaultSearchManager extends BasePageFilter implements SearchManage
private void loadSearchProvider( final Properties properties ) {
// See if we're using Lucene, and if so, ensure that its index directory is up to date.
- final String providerClassName = properties.getProperty( PROP_SEARCHPROVIDER, DEFAULT_SEARCHPROVIDER );
+
+ final String providerClassName = TextUtil.getStringProperty( properties, PROP_SEARCHPROVIDER, DEFAULT_SEARCHPROVIDER );
try {
final Class<?> providerClass = ClassUtil.findClass( "org.apache.wiki.search", providerClassName );