[ofbiz-tools] branch master updated: Because of checkstyle SOLR_CONFIG_NAME is the new name of solrConfigName

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git


The following commit(s) were added to refs/heads/master by this push:
     new 228f051  Because of checkstyle SOLR_CONFIG_NAME is the new name of 
solrConfigName
228f051 is described below

commit 228f0511a906c6befb1ada1bdeea39e96d124c9d
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Fri Mar 25 12:33:42 2022 +0100

    Because of checkstyle SOLR_CONFIG_NAME is the new name of solrConfigName
---
 demo-backup/patch/next/solr.config.patch  | 2 +-
 demo-backup/patch/trunk/solr.config.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo-backup/patch/next/solr.config.patch 
b/demo-backup/patch/next/solr.config.patch
index d5bbdbe..aa00494 100644
--- a/demo-backup/patch/next/solr.config.patch
+++ b/demo-backup/patch/next/solr.config.patch
@@ -21,7 +21,7 @@ index 3e05b70..50c8bad 100644
      private static final boolean trustSelfSignedCert = 
getTrustSelfSignedCert();
      
      public static String makeSolrWebappUrl() {
-+        final String solrCompleteUrl = 
UtilProperties.getPropertyValue(solrConfigName, "solr.complete.url");
++        final String solrCompleteUrl = 
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.complete.url");
 +        if (UtilValidate.isNotEmpty(solrCompleteUrl)) {
 +            return solrCompleteUrl;
 +        }
diff --git a/demo-backup/patch/trunk/solr.config.patch 
b/demo-backup/patch/trunk/solr.config.patch
index d145aae..81fb98d 100644
--- a/demo-backup/patch/trunk/solr.config.patch
+++ b/demo-backup/patch/trunk/solr.config.patch
@@ -45,7 +45,7 @@ index 4c0d2345..b216a6d1 100644
      private static final boolean TRUST_SELF_SIGNED_CERT = 
getTrustSelfSignedCert();
  
      public static String makeSolrWebappUrl() {
-+        final String solrCompleteUrl = 
UtilProperties.getPropertyValue(solrConfigName, "solr.complete.url");
++        final String solrCompleteUrl = 
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.complete.url");
 +        if (UtilValidate.isNotEmpty(solrCompleteUrl)) {
 +            return solrCompleteUrl;
 +        }