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

mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit e7502ac544327a5d1c5602572219570cbedc3847
Author: Michael Brohl <michael.br...@ecomify.de>
AuthorDate: Fri Feb 2 12:40:46 2024 +0100

    Fixed: Corrections based on Codenarc and Checkstyle errors (OFBIZ-10194)
---
 .../src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java | 2 +-
 .../org/apache/ofbiz/product/product/ProductPromoContentWrapper.java   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
 
b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
index 86b321e404..9b584dfe86 100644
--- 
a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
+++ 
b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
@@ -38,7 +38,7 @@ import org.apache.ofbiz.entity.util.EntityUtilProperties;
 public interface ContentWrapper {
 
     String MODULE = ContentWrapper.class.getName();
-    static final String CACHE_KEY_SEPARATOR = "::";
+    String CACHE_KEY_SEPARATOR = "::";
 
     StringUtil.StringWrapper get(String contentTypeId, String encoderType);
 
diff --git 
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
 
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
index b3ce91881a..86f2aa8141 100644
--- 
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
+++ 
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
@@ -117,7 +117,8 @@ public class ProductPromoContentWrapper implements 
ContentWrapper {
         /* caching: there is one cache created, "product.promo.content"  Each 
productPromo's content is cached with a key of
          * contentTypeId::locale::mimeType::productPromoId, or whatever the 
CACHE_KEY_SEPARATOR is defined above to be.
          */
-        String cacheKey = productPromoContentTypeId + CACHE_KEY_SEPARATOR + 
locale + CACHE_KEY_SEPARATOR + mimeTypeId + CACHE_KEY_SEPARATOR + 
productPromo.get("productPromoId")
+        String cacheKey = productPromoContentTypeId + CACHE_KEY_SEPARATOR + 
locale + CACHE_KEY_SEPARATOR + mimeTypeId
+                + CACHE_KEY_SEPARATOR + productPromo.get("productPromoId")
                 + CACHE_KEY_SEPARATOR + encoderType + CACHE_KEY_SEPARATOR + 
delegator;
         String cachedValue = PRODUCT_PROMO_CONTENT_CACHE.get(cacheKey);
         if (cachedValue != null || 
PRODUCT_PROMO_CONTENT_CACHE.containsKey(cacheKey)) {

Reply via email to