Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid NRE in ElasticQueryService.SearchAsync() #15600

Merged
merged 1 commit into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ namespace OrchardCore.Search.Elasticsearch;

public class ElasticsearchConstants
{
public const string StandardAnalyzer = "standard";
Skrypt marked this conversation as resolved.
Show resolved Hide resolved

public const string DefaultAnalyzer = "standard";
}
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ public async Task<bool> CreateIndexAsync(ElasticIndexSettings elasticIndexSettin
if (_elasticsearchOptions.Analyzers.TryGetValue(analyzerName, out var analyzerProperties))
{
var analyzer = CreateAnalyzer(analyzerProperties);
analyzersDescriptor = new AnalyzersDescriptor();
Skrypt marked this conversation as resolved.
Show resolved Hide resolved
analysisDescriptor.Analyzers(a => a.UserDefined(analyzerName, analyzer));

indexSettingsDescriptor = new IndexSettingsDescriptor();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public async Task<ElasticTopDocs> SearchAsync(string indexName, string query)
if (_elasticClient == null)
Skrypt marked this conversation as resolved.
Show resolved Hide resolved
{
_logger.LogWarning("Elasticsearch Client is not setup, please validate your Elasticsearch Configurations");

return elasticTopDocs;
Skrypt marked this conversation as resolved.
Show resolved Hide resolved
}

try
Expand Down
Loading