diff --git a/example/groovyScripts/PrepareLocalesForDropDown.groovy b/example/groovyScripts/PrepareLocalesForDropDown.groovy index 9ffeebbb8..f90071b89 100644 --- a/example/groovyScripts/PrepareLocalesForDropDown.groovy +++ b/example/groovyScripts/PrepareLocalesForDropDown.groovy @@ -20,5 +20,3 @@ under the License. def localeMap = [] org.apache.ofbiz.base.util.UtilMisc.availableLocales().each { localeMap.add(localeId:it.toString()) } parameters.localeList = localeMap - -EntityQuery.use(delegator).from("ExampleTypeView").queryList() \ No newline at end of file diff --git a/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java b/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java index 7505ba6ca..6213b3d63 100644 --- a/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java +++ b/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java @@ -19,7 +19,6 @@ package org.apache.ofbiz.solr; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -200,21 +199,21 @@ public final class ProductUtil { if (product != null && "AGGREGATED".equals(product.getString("productTypeId"))) { ProductConfigWrapper configWrapper = new ProductConfigWrapper(delegator, dispatcher, productId, null, null, null, null, locale, userLogin); - String listPrice = configWrapper.getTotalListPrice().setScale(2, RoundingMode.HALF_DOWN).toString(); + String listPrice = configWrapper.getTotalListPrice().setScale(2, BigDecimal.ROUND_HALF_DOWN).toString(); if (listPrice != null) dispatchContext.put("listPrice", listPrice); - String defaultPrice = configWrapper.getTotalListPrice().setScale(2, RoundingMode.HALF_DOWN).toString(); + String defaultPrice = configWrapper.getTotalListPrice().setScale(2, BigDecimal.ROUND_HALF_DOWN).toString(); if (defaultPrice != null) dispatchContext.put("defaultPrice", defaultPrice); } else { Map priceContext = UtilMisc.toMap("product", product); Map priceMap = dispatcher.runSync("calculateProductPrice", priceContext); if (priceMap.get("listPrice") != null) { - String listPrice = ((BigDecimal) priceMap.get("listPrice")).setScale(2, RoundingMode.HALF_DOWN).toString(); + String listPrice = ((BigDecimal) priceMap.get("listPrice")).setScale(2, BigDecimal.ROUND_HALF_DOWN).toString(); dispatchContext.put("listPrice", listPrice); } if (priceMap.get("defaultPrice") != null) { - String defaultPrice = ((BigDecimal) priceMap.get("defaultPrice")).setScale(2, RoundingMode.HALF_DOWN).toString(); + String defaultPrice = ((BigDecimal) priceMap.get("defaultPrice")).setScale(2, BigDecimal.ROUND_HALF_DOWN).toString(); if (defaultPrice != null) dispatchContext.put("defaultPrice", defaultPrice); }