(ofbiz-framework) branch trunk updated: Improved: comments and code formatting, no functional changes.

[mbrohl]

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


The following commit(s) were added to refs/heads/trunk by this push:
     new 1d9df1edd0 Improved: comments and code formatting, no functional 
changes.
1d9df1edd0 is described below

commit 1d9df1edd0441f0638b866d0a8eb56c10b512ed9
Author: Michael Brohl <mbr...@apache.org>
AuthorDate: Fri Feb 2 14:16:06 2024 +0100

    Improved: comments and code formatting, no functional changes.
---
 .../org/apache/ofbiz/product/product/ProductContentWrapper.java    | 7 +++----
 .../apache/ofbiz/product/product/ProductPromoContentWrapper.java   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
 
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
index f80918aa33..fa8aa1b402 100644
--- 
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
+++ 
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
@@ -107,13 +107,12 @@ public class ProductContentWrapper implements 
ContentWrapper {
         /*
          * Look for a previously cached entry (may also be an entry with null 
value if
          * there was no content to retrieve) caching: there is one cache 
created,
-         * "product.content" Each product's content is cached with a key of
+         * "product.content.rendered" Each product's content is cached with a 
key of
          * contentTypeId::locale::mimeType::productId, or whatever the 
CACHE_KEY_SEPARATOR is
          * defined above to be.
          */
-        String cacheKey = productContentTypeId + CACHE_KEY_SEPARATOR + locale 
+ CACHE_KEY_SEPARATOR + mimeTypeId + CACHE_KEY_SEPARATOR + product.get(
-                "productId") + CACHE_KEY_SEPARATOR
-                + encoderType + CACHE_KEY_SEPARATOR + delegator;
+        String cacheKey = productContentTypeId + CACHE_KEY_SEPARATOR + locale 
+ CACHE_KEY_SEPARATOR + mimeTypeId + CACHE_KEY_SEPARATOR
+                + product.get("productId") + CACHE_KEY_SEPARATOR + encoderType 
+ CACHE_KEY_SEPARATOR + delegator;
         String cachedValue = PRODUCT_CONTENT_CACHE.get(cacheKey);
         if (cachedValue != null || 
PRODUCT_CONTENT_CACHE.containsKey(cacheKey)) {
             return cachedValue;
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 175b31d0c0..41e95176e6 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
@@ -114,7 +114,7 @@ public class ProductPromoContentWrapper implements 
ContentWrapper {
         /* Look for a previously cached entry (may also be an entry with null 
value if
          * there was no content to retrieve)
          */
-        /* caching: there is one cache created, "product.promo.content"  Each 
productPromo's content is cached with a key of
+        /* caching: there is one cache created, 
"product.promo.content.rendered"  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