svn commit: r1818020 - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1818020 - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
Author: jleroux
Date: Wed Dec 13 14:11:38 2017 New Revision: 1818020 URL: http://svn.apache.org/viewvc?rev=1818020&view=rev Log: Improved: Always check if debug verbose is on when using Debug.logVerbose() (OFBIZ-10052) This completes r1818010, there were much more cases. Also few tabs automatically replaced by spaces Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java ofbiz/ofbiz-framework/trunk/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java Wed Dec 13 14:11:38 2017 @@ -33,6 +33,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; + import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVRecord; @@ -1977,7 +1978,7 @@ public class InvoiceServices { String returnId = entry.getKey(); List<GenericValue> billItems = entry.getValue(); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Creating invoice for return [" + returnId + "] with items: " + billItems.toString(), module); + Debug.logVerbose("Creating invoice for return [" + returnId + "] with items: " + billItems.toString(), module); } Map<String, Object> input = UtilMisc.toMap("returnId", returnId, "billItems", billItems, "userLogin", context.get("userLogin")); Map<String, Object> serviceResults = dispatcher.runSync("createInvoiceFromReturn", input); @@ -2014,7 +2015,7 @@ public class InvoiceServices { // get the return header GenericValue returnHeader = EntityQuery.use(delegator).from("ReturnHeader").where("returnId", returnId).queryOne(); if (returnHeader == null || returnHeader.get("returnHeaderTypeId") == null) { - return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingReturnTypeCannotBeNull", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingReturnTypeCannotBeNull", locale)); } if (returnHeader.getString("returnHeaderTypeId").startsWith("CUSTOMER_")) { @@ -2157,7 +2158,7 @@ public class InvoiceServices { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(serviceResults)); } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Creating Invoice Item with amount " + returnPrice + " and quantity " + quantity + Debug.logVerbose("Creating Invoice Item with amount " + returnPrice + " and quantity " + quantity + " for shipment [" + item.getString("shipmentId") + ":" + item.getString("shipmentItemSeqId") + "]", module); } @@ -2203,7 +2204,7 @@ public class InvoiceServices { BigDecimal amount = adjustment.getBigDecimal("amount"); amount = amount.multiply(ratio).setScale(DECIMALS, ROUNDING); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Creating Invoice Item with amount " + adjustment.getBigDecimal("amount") + " prorated to " + amount + Debug.logVerbose("Creating Invoice Item with amount " + adjustment.getBigDecimal("amount") + " prorated to " + amount + " for return adjustment [" + adjustment.getString("returnAdjustmentId") + "]", module); } @@ -2263,7 +2264,7 @@ public class InvoiceServices { // prorate the adjustment amount by the actual to promised ratio BigDecimal amount = adjustment.getBigDecimal("amount").multiply(actualToPromisedRatio).setScale(DECIMALS, ROUNDING); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Creating Invoice Item with amount " + adjustment.getBigDecimal("amount") + " prorated to " + amount + Debug.logVerbose("Creating Invoice Item with amount " + adjustment.getBigDecimal("amount") + " prorated to " + amount + " for return adjustment [" + adjustment.getString("returnAdjustmentId") + "]", module); } @@ -2381,7 +2382,7 @@ public class InvoiceServices { if (totalPayments.signum() == 1) { BigDecimal invoiceTotal = InvoiceWorker.getInvoiceTotal(delegator, invoiceId); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Invoice #" + invoiceId + " total: " + invoiceTotal, module); + Debug.logVerbose("Invoice #" + invoiceId + " total: " + invoiceTotal, module); if (Debug.verboseOn()) Debug.logVerbose("Total payments : " + totalPayments, module); } if (totalPayments.compareTo(invoiceTotal) >= 0) { // this checks that totalPayments is greater than or equal to invoiceTotal @@ -2417,7 +2418,7 @@ public class InvoiceServices { // pro-rate the amount BigDecimal amount = ZERO; if("DONATION_ADJUSTMENT".equals(adj.getString("orderAdjustmentTypeId"))) { - amount=baseAmount; + amount=baseAmount; } else if (divisor.signum() != 0) { // make sure the divisor is not 0 to avoid NaN problems; just leave the amount as 0 and skip it in essense // multiply first then divide to avoid rounding errors amount = baseAmount.multiply(multiplier).divide(divisor, decimals, rounding); @@ -3538,7 +3539,7 @@ public class InvoiceServices { } public static Map<String, Object> importInvoice(DispatchContext dctx, Map<String, Object> context) { - Locale locale = (Locale) context.get("locale"); + Locale locale = (Locale) context.get("locale"); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java Wed Dec 13 14:11:38 2017 @@ -889,7 +889,7 @@ public class CCPaymentServices { throw new ClearCommerceException("Missing server URL; check your ClearCommerce configuration"); } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("ClearCommerce server URL: " + serverURL, module); + Debug.logVerbose("ClearCommerce server URL: " + serverURL, module); } OutputStream os = new ByteArrayOutputStream(); @@ -903,7 +903,7 @@ public class CCPaymentServices { String xmlString = os.toString(); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("ClearCommerce XML request string: " + xmlString, module); + Debug.logVerbose("ClearCommerce XML request string: " + xmlString, module); } HttpClient http = new HttpClient(serverURL); Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java Wed Dec 13 14:11:38 2017 @@ -173,7 +173,7 @@ public class PayflowPro { } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Response from Verisign: " + resp, module); + Debug.logVerbose("Response from Verisign: " + resp, module); } if (isPayPal) { // Attach the avs info returned in doExpressCheckout and stored in PayPalPaymentMethod Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java Wed Dec 13 14:11:38 2017 @@ -364,7 +364,7 @@ public class DataServices { } String textData = (String) context.get("textData"); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("in updateElectronicText, textData:" + textData, module); + Debug.logVerbose("in updateElectronicText, textData:" + textData, module); } try { electronicText = EntityQuery.use(delegator).from("ElectronicText").where("dataResourceId", dataResourceId).queryOne(); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/layout/LayoutEvents.java Wed Dec 13 14:11:38 2017 @@ -416,7 +416,7 @@ public class LayoutEvents { String contentIdTo = (String) paramMap.get("contentIdTo"); String mapKey = (String) paramMap.get("mapKey"); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("in createSubContent, contentIdTo:" + contentIdTo, module); + Debug.logVerbose("in createSubContent, contentIdTo:" + contentIdTo, module); if (Debug.verboseOn()) Debug.logVerbose("in createSubContent, mapKey:" + mapKey, module); } Map<String, Object> context = new HashMap<String, Object>(); @@ -449,7 +449,7 @@ public class LayoutEvents { context.put("textData", paramMap.get("textData")); context.put("contentAssocTypeId", "SUB_CONTENT"); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("in createSubContent, context:" + context, module); + Debug.logVerbose("in createSubContent, context:" + context, module); } Map<String, Object> result = dispatcher.runSync("persistContentAndAssoc", context); boolean isError = ModelService.RESPOND_ERROR.equals(result.get(ModelService.RESPONSE_MESSAGE)); @@ -459,7 +459,7 @@ public class LayoutEvents { } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("in createLayoutFile, result:" + result, module); + Debug.logVerbose("in createLayoutFile, result:" + result, module); } String contentId = (String) result.get("contentId"); String dataResourceId = (String) result.get("dataResourceId"); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java Wed Dec 13 14:11:38 2017 @@ -63,20 +63,20 @@ public class RenderContentAsText impleme final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env); final Map<String, Object> templateRoot = FreeMarkerWorker.createEnvironmentMap(env); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module); + Debug.logVerbose("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module); } FreeMarkerWorker.getSiteParameters(request, templateRoot); final Map<String, Object> savedValuesUp = new HashMap<String, Object>(); FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp); FreeMarkerWorker.overrideWithArgs(templateRoot, args); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module); + Debug.logVerbose("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module); } final String thisContentId = (String)templateRoot.get("contentId"); final String xmlEscape = (String)templateRoot.get("xmlEscape"); final boolean directAssocMode = UtilValidate.isNotEmpty(thisContentId) ? true : false; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("in Render(0), directAssocMode ." + directAssocMode , module); + Debug.logVerbose("in Render(0), directAssocMode ." + directAssocMode , module); } final Map<String, Object> savedValues = new HashMap<String, Object>(); @@ -96,7 +96,7 @@ public class RenderContentAsText impleme public void close() throws IOException { List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.checkList(templateRoot.get("globalNodeTrail")); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Render close, globalNodeTrail(2a):" + ContentWorker.nodeTrailToCsv(globalNodeTrail), ""); + Debug.logVerbose("Render close, globalNodeTrail(2a):" + ContentWorker.nodeTrailToCsv(globalNodeTrail), ""); } renderSubContent(); } @@ -113,7 +113,7 @@ public class RenderContentAsText impleme String editRequestName = (String)templateRoot.get("editRequestName"); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("in Render(3), editRequestName ." + editRequestName , module); + Debug.logVerbose("in Render(3), editRequestName ." + editRequestName , module); } if (UtilValidate.isNotEmpty(editRequestName)) { @@ -122,7 +122,7 @@ public class RenderContentAsText impleme } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module); + Debug.logVerbose("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module); if (Debug.verboseOn()) Debug.logVerbose("in RenderSubContent, subContentId(2):" + templateRoot.get("subContentId"), module); } FreeMarkerWorker.saveContextValues(templateRoot, saveKeyNames, savedValues); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/inventory/InventoryServices.java Wed Dec 13 14:11:38 2017 @@ -730,7 +730,7 @@ public class InventoryServices { } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("productIdTo = " + productIdTo + " assocQuantity = " + assocQuantity + "current QOH " + currentQuantityOnHandTotal + + Debug.logVerbose("productIdTo = " + productIdTo + " assocQuantity = " + assocQuantity + "current QOH " + currentQuantityOnHandTotal + "currentATP = " + currentAvailableToPromiseTotal + " minQOH = " + minQuantityOnHandTotal + " minATP = " + minAvailableToPromiseTotal, module); } } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java Wed Dec 13 14:11:38 2017 @@ -982,7 +982,7 @@ public class PriceServices { } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Unchecked Calculated price: " + price, module); + Debug.logVerbose("Unchecked Calculated price: " + price, module); if (Debug.verboseOn()) Debug.logVerbose("PriceInfo:", module); for (GenericValue orderItemPriceInfo: orderItemPriceInfos) { if (Debug.verboseOn()) Debug.logVerbose(" --- " + orderItemPriceInfo.toString(), module); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/dhl/DhlServices.java Wed Dec 13 14:11:38 2017 @@ -121,7 +121,7 @@ public class DhlServices { } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("DHL Connect URL : " + conStr, module); + Debug.logVerbose("DHL Connect URL : " + conStr, module); if (Debug.verboseOn()) Debug.logVerbose("DHL XML String : " + xmlString, module); } @@ -141,7 +141,7 @@ public class DhlServices { "FacilityShipmentDhlReceivedNullResponse", locale)); } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("DHL Response : " + response, module); + Debug.logVerbose("DHL Response : " + response, module); } return response; Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java Wed Dec 13 14:11:38 2017 @@ -118,7 +118,7 @@ public class FedexServices { } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Fedex Connect URL : " + url, module); + Debug.logVerbose("Fedex Connect URL : " + url, module); if (Debug.verboseOn()) Debug.logVerbose("Fedex XML String : " + xmlString, module); } @@ -138,7 +138,7 @@ public class FedexServices { "FacilityShipmentFedexReceivedNullResponse", locale)); } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Fedex Response : " + response, module); + Debug.logVerbose("Fedex Response : " + response, module); } return response; Modified: ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java Wed Dec 13 14:11:38 2017 @@ -421,7 +421,7 @@ public class LoginEvents { String cookieUsername = null; Cookie[] cookies = request.getCookies(); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Cookies:" + Arrays.toString(cookies), module); + Debug.logVerbose("Cookies:" + Arrays.toString(cookies), module); } if (cookies != null) { for (Cookie cookie: cookies) { Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java Wed Dec 13 14:11:38 2017 @@ -696,7 +696,7 @@ public class ICalConverter { } } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Processing calendar:\r\n" + calendar, module); + Debug.logVerbose("Processing calendar:\r\n" + calendar, module); } String workEffortId = fromXProperty(calendar.getProperties(), workEffortIdXPropName); if (workEffortId == null) { Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalWorker.java Wed Dec 13 14:11:38 2017 @@ -171,7 +171,7 @@ public final class ICalWorker { try { Document requestDocument = WebDavUtil.getDocumentFromRequest(request); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("[handlePropFindRequest] PROPFIND body:\r\n" + UtilXml.writeXmlDocument(requestDocument), module); + Debug.logVerbose("[handlePropFindRequest] PROPFIND body:\r\n" + UtilXml.writeXmlDocument(requestDocument), module); } PropFindHelper helper = new PropFindHelper(requestDocument); if (!helper.isAllProp() && !helper.isPropName()) { @@ -207,7 +207,7 @@ public final class ICalWorker { rootElement.appendChild(responseElement); responseDocument.appendChild(rootElement); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("[handlePropFindRequest] PROPFIND response:\r\n" + UtilXml.writeXmlDocument(responseDocument), module); + Debug.logVerbose("[handlePropFindRequest] PROPFIND response:\r\n" + UtilXml.writeXmlDocument(responseDocument), module); } ResponseHelper.prepareResponse(response, 207, "Multi-Status"); try (Writer writer = response.getWriter()) { @@ -309,7 +309,7 @@ public final class ICalWorker { private static void writeResponse(ResponseProperties responseProps, HttpServletRequest request, HttpServletResponse response, ServletContext context) throws IOException { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Returning response: code = " + responseProps.statusCode + + Debug.logVerbose("Returning response: code = " + responseProps.statusCode + ", message = " + responseProps.statusMessage, module); } response.setStatus(responseProps.statusCode); Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentConfig.java Wed Dec 13 14:11:38 2017 @@ -459,7 +459,7 @@ public final class ComponentConfig { throw new ComponentException("Error reading container configurations for component: " + this.globalName, ce); } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Read component config : [" + rootLocation + "]", module); + Debug.logVerbose("Read component config : [" + rootLocation + "]", module); } } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java Wed Dec 13 14:11:38 2017 @@ -55,7 +55,7 @@ public class ComponentResourceHandler im this.loaderName = loaderName; this.location = location; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this.toString(), module); + Debug.logVerbose("Created " + this.toString(), module); } } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/Converters.java Wed Dec 13 14:11:38 2017 @@ -74,7 +74,7 @@ public class Converters { public static <S, T> Converter<S, T> getConverter(Class<S> sourceClass, Class<T> targetClass) throws ClassNotFoundException { String key = sourceClass.getName().concat(DELIMITER).concat(targetClass.getName()); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Getting converter: " + key, module); + Debug.logVerbose("Getting converter: " + key, module); } OUTER: do { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/GroovyUtil.java Wed Dec 13 14:11:38 2017 @@ -85,14 +85,14 @@ public class GroovyUtil { return null; } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Evaluating -- " + expression, module); + Debug.logVerbose("Evaluating -- " + expression, module); if (Debug.verboseOn()) Debug.logVerbose("Using Context -- " + context, module); } try { GroovyShell shell = new GroovyShell(getBinding(context, expression)); o = shell.evaluate(StringUtil.convertOperatorSubstitutions(expression)); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Evaluated to -- " + o, module); + Debug.logVerbose("Evaluated to -- " + o, module); } // read back the context info Binding binding = shell.getContext(); @@ -160,7 +160,7 @@ public class GroovyUtil { Class<?> scriptClassCached = parsedScripts.putIfAbsent(location, scriptClass); if (scriptClassCached == null) { // putIfAbsent returns null if the class is added to the cache if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Cached Groovy script at: " + location, module); + Debug.logVerbose("Cached Groovy script at: " + location, module); } } else { // the newly parsed script is discarded and the one found in the cache (that has been created by a concurrent thread in the meantime) is used Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectType.java Wed Dec 13 14:11:38 2017 @@ -800,7 +800,7 @@ public class ObjectType { if (value instanceof java.util.Date) return false; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("In ObjectType.isEmpty(Object value) returning false for " + value.getClass() + " Object.", module); + Debug.logVerbose("In ObjectType.isEmpty(Object value) returning false for " + value.getClass() + " Object.", module); } return false; } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java Wed Dec 13 14:11:38 2017 @@ -52,7 +52,7 @@ public class PatternFactory { } pattern = compiledPerl5Patterns.putIfAbsentAndGet(stringPattern, pattern); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Compiled and cached the pattern: '" + stringPattern, module); + Debug.logVerbose("Compiled and cached the pattern: '" + stringPattern, module); } } return pattern; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java Wed Dec 13 14:11:38 2017 @@ -108,7 +108,7 @@ public final class ScriptUtil { if (iter.hasNext()) { helperFactory = iter.next(); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("ScriptHelper factory set to " + helperFactory.getClass().getName(), module); + Debug.logVerbose("ScriptHelper factory set to " + helperFactory.getClass().getName(), module); } } else { Debug.logWarning("ScriptHelper factory not found", module); @@ -140,11 +140,11 @@ public final class ScriptUtil { .getUtf8())); script = compilableEngine.compile(reader); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Compiled script " + filePath + " using engine " + engine.getClass().getName(), module); + Debug.logVerbose("Compiled script " + filePath + " using engine " + engine.getClass().getName(), module); } } catch (ClassCastException e) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Script engine " + engine.getClass().getName() + " does not implement Compilable", module); + Debug.logVerbose("Script engine " + engine.getClass().getName() + " does not implement Compilable", module); } } if (script != null) { @@ -177,11 +177,11 @@ public final class ScriptUtil { Compilable compilableEngine = (Compilable) engine; compiledScript = compilableEngine.compile(script); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Compiled script [" + script + "] using engine " + engine.getClass().getName(), module); + Debug.logVerbose("Compiled script [" + script + "] using engine " + engine.getClass().getName(), module); } } catch (ClassCastException e) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Script engine " + engine.getClass().getName() + " does not implement Compilable", module); + Debug.logVerbose("Script engine " + engine.getClass().getName() + " does not implement Compilable", module); } } if (compiledScript != null) { @@ -273,7 +273,7 @@ public final class ScriptUtil { throw new IllegalArgumentException("The script type is not supported for language: " + language); } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Begin processing script [" + script + "] using engine " + engine.getClass().getName(), module); + Debug.logVerbose("Begin processing script [" + script + "] using engine " + engine.getClass().getName(), module); } ScriptContext scriptContext = createScriptContext(context); return engine.eval(script, scriptContext); @@ -298,7 +298,7 @@ public final class ScriptUtil { Object result = script.eval(scriptContext); if (UtilValidate.isNotEmpty(functionName)) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Invoking function/method " + functionName, module); + Debug.logVerbose("Invoking function/method " + functionName, module); } ScriptEngine engine = script.getEngine(); try { @@ -380,7 +380,7 @@ public final class ScriptUtil { throw new IllegalArgumentException("The script type is not supported for location: " + filePath); } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Begin processing script [" + filePath + "] using engine " + engine.getClass().getName(), module); + Debug.logVerbose("Begin processing script [" + filePath + "] using engine " + engine.getClass().getName(), module); } engine.setContext(scriptContext); URL scriptUrl = FlexibleLocation.resolveLocation(filePath); Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java Wed Dec 13 14:11:38 2017 @@ -533,7 +533,7 @@ public class StringUtil { result = pattern.matcher(result).replaceAll(entry.getKey()); } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Converted " + expression + " to " + result, module); + Debug.logVerbose("Converted " + expression + " to " + result, module); } } return result; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java Wed Dec 13 14:11:38 2017 @@ -159,7 +159,7 @@ public final class UtilHttp { } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Made Request Parameter Map with [" + paramMap.size() + "] Entries", module); + Debug.logVerbose("Made Request Parameter Map with [" + paramMap.size() + "] Entries", module); //Debug.logVerbose("Request Parameter Map Entries: " + System.getProperty("line.separator") + UtilMisc.printMap(paramMap), module); see OFBIZ-9310 } @@ -319,7 +319,7 @@ public final class UtilHttp { } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Made Request Attribute Map with [" + attributeMap.size() + "] Entries", module); + Debug.logVerbose("Made Request Attribute Map with [" + attributeMap.size() + "] Entries", module); if (Debug.verboseOn()) Debug.logVerbose("Request Attribute Map Entries: " + System.getProperty("line.separator") + UtilMisc.printMap(attributeMap), module); } @@ -354,7 +354,7 @@ public final class UtilHttp { } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Made Session Attribute Map with [" + sessionMap.size() + "] Entries", module); + Debug.logVerbose("Made Session Attribute Map with [" + sessionMap.size() + "] Entries", module); if (Debug.verboseOn()) Debug.logVerbose("Session Attribute Map Entries: " + System.getProperty("line.separator") + UtilMisc.printMap(sessionMap), module); } @@ -389,7 +389,7 @@ public final class UtilHttp { } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Made ServletContext Attribute Map with [" + servletCtxMap.size() + "] Entries", module); + Debug.logVerbose("Made ServletContext Attribute Map with [" + servletCtxMap.size() + "] Entries", module); if (Debug.verboseOn()) Debug.logVerbose("ServletContext Attribute Map Entries: " + System.getProperty("line.separator") + UtilMisc.printMap(servletCtxMap), module); } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java Wed Dec 13 14:11:38 2017 @@ -76,7 +76,7 @@ public final class FlexibleMapAccessor<T this.isAscending = isAscending; this.fse = fse; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("FlexibleMapAccessor created, original = " + this.original, module); + Debug.logVerbose("FlexibleMapAccessor created, original = " + this.original, module); } } @@ -149,7 +149,7 @@ public final class FlexibleMapAccessor<T } catch (PropertyNotFoundException e) { // PropertyNotFound exceptions are common, so log verbose. if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("UEL exception while getting value: " + e + ", original = " + this.original, module); + Debug.logVerbose("UEL exception while getting value: " + e + ", original = " + this.original, module); } } catch (Exception e) { Debug.logError("UEL exception while getting value: " + e + ", original = " + this.original, module); Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java Wed Dec 13 14:11:38 2017 @@ -604,7 +604,7 @@ public abstract class FlexibleStringExpa } } catch (PropertyNotFoundException e) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Error evaluating expression: " + e, module); + Debug.logVerbose("Error evaluating expression: " + e, module); } } catch (Exception e) { Debug.logError("Error evaluating expression: " + e, module); @@ -658,7 +658,7 @@ public abstract class FlexibleStringExpa return obj; } else { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Scriptlet evaluated to null [" + this + "].", module); + Debug.logVerbose("Scriptlet evaluated to null [" + this + "].", module); } } } catch (Exception e) { @@ -693,7 +693,7 @@ public abstract class FlexibleStringExpa return UelUtil.evaluate(context, openBracket.concat(expr.toString()).concat(closeBracket)); } catch (PropertyNotFoundException e) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Error evaluating expression: " + e, module); + Debug.logVerbose("Error evaluating expression: " + e, module); } } catch (Exception e) { Debug.logError("Error evaluating expression: " + e, module); @@ -718,7 +718,7 @@ public abstract class FlexibleStringExpa obj = UelUtil.evaluate(context, new String(this.bracketedOriginal)); } catch (PropertyNotFoundException e) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Error evaluating expression " + this + ": " + e, module); + Debug.logVerbose("Error evaluating expression " + this + ": " + e, module); } } catch (Exception e) { Debug.logError("Error evaluating expression " + this + ": " + e, module); Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java Wed Dec 13 14:11:38 2017 @@ -88,7 +88,7 @@ public class JuelConnector { if (base == null) { base = UelUtil.autoVivifyListOrMap(property); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("ExtendedAstBracket.setValue auto-vivify base: " + base + ", property = " + property, module); + Debug.logVerbose("ExtendedAstBracket.setValue auto-vivify base: " + base + ", property = " + property, module); } prefix.setValue(bindings, context, base); } @@ -124,7 +124,7 @@ public class JuelConnector { if (base == null) { base = UelUtil.autoVivifyListOrMap(property); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("ExtendedAstDot.setValue auto-vivify base: " + base + ", property = " + property, module); + Debug.logVerbose("ExtendedAstDot.setValue auto-vivify base: " + base + ", property = " + property, module); } prefix.setValue(bindings, context, base); } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelUtil.java Wed Dec 13 14:11:38 2017 @@ -97,7 +97,7 @@ public final class UelUtil { */ public static void setValue(Map<String, Object> context, String expression, Class expectedType, Object value) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("UelUtil.setValue invoked, expression = " + expression + ", value = " + value, module); + Debug.logVerbose("UelUtil.setValue invoked, expression = " + expression + ", value = " + value, module); } ELContext elContext = new BasicContext(context); ValueExpression ve = exprFactory.createValueExpression(elContext, expression, expectedType); @@ -111,7 +111,7 @@ public final class UelUtil { */ public static void removeValue(Map<String, Object> context, String expression) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("UelUtil.removeValue invoked, expression = " + expression , module); + Debug.logVerbose("UelUtil.removeValue invoked, expression = " + expression , module); } ELContext elContext = new BasicContext(context); ValueExpression ve = exprFactory.createValueExpression(elContext, expression, Object.class); @@ -340,7 +340,7 @@ public final class UelUtil { super.setValue(context, base, property, val); if (!context.isPropertyResolved() && base == null) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("ExtendedCompositeResolver.setValue: base = " + base + ", property = " + property + ", value = " + val, module); + Debug.logVerbose("ExtendedCompositeResolver.setValue: base = " + base + ", property = " + property + ", value = " + val, module); } try { BasicContext elContext = (BasicContext) context; @@ -375,14 +375,14 @@ public final class UelUtil { String str = property.toString(); if ("add".equals(str)) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("ExtendedListResolver.setValue adding List element: base = " + base + ", property = " + property + ", value = " + val, module); + Debug.logVerbose("ExtendedListResolver.setValue adding List element: base = " + base + ", property = " + property + ", value = " + val, module); } context.setPropertyResolved(true); List list = (List) base; list.add(val); } else if (str.startsWith("insert@")) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("ExtendedListResolver.setValue inserting List element: base = " + base + ", property = " + property + ", value = " + val, module); + Debug.logVerbose("ExtendedListResolver.setValue inserting List element: base = " + base + ", property = " + property + ", value = " + val, module); } context.setPropertyResolved(true); String indexStr = str.replace("insert@", ""); @@ -436,7 +436,7 @@ public final class UelUtil { } if (locale == null) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("ExtendedMapResolver.getValue: unable to find Locale for LocalizedMap element, using default locale", module); + Debug.logVerbose("ExtendedMapResolver.getValue: unable to find Locale for LocalizedMap element, using default locale", module); } locale = Locale.getDefault(); } Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java Wed Dec 13 14:11:38 2017 @@ -144,7 +144,7 @@ public final class FreeMarkerWorker { String key = (String) i.next(); String className = props.getProperty(key); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Adding FTL Transform " + key + " with class " + className, module); + Debug.logVerbose("Adding FTL Transform " + key + " with class " + className, module); } try { config.setSharedVariable(key, loader.loadClass(className).newInstance()); Modified: ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/datafile/src/main/java/org/apache/ofbiz/datafile/ModelDataFileReader.java Wed Dec 13 14:11:38 2017 @@ -146,7 +146,7 @@ public final class ModelDataFileReader { ModelDataFile dataFile = createModelDataFile(curDataFile); result.put(dataFileName, dataFile); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Loaded dataFile: " + dataFileName, module); + Debug.logVerbose("Loaded dataFile: " + dataFileName, module); } } return result; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericEntity.java Wed Dec 13 14:11:38 2017 @@ -1227,7 +1227,7 @@ public class GenericEntity implements Ma // Replace each char which is out of the ASCII range with a XML entity String replacement = "&#" + (int) curChar + ";"; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Entity: " + this.getEntityName() + ", PK: " + this.getPrimaryKey().toString() + " -> char [" + curChar + "] replaced with [" + replacement + "]", module); + Debug.logVerbose("Entity: " + this.getEntityName() + ", PK: " + this.getPrimaryKey().toString() + " -> char [" + curChar + "] replaced with [" + replacement + "]", module); } value.replace(i, i+1, replacement); } Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java Wed Dec 13 14:11:38 2017 @@ -122,11 +122,11 @@ public final class TransactionUtil imple try { int currentStatus = ut.getStatus(); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Current status : " + getTransactionStateString(currentStatus), module); + Debug.logVerbose("Current status : " + getTransactionStateString(currentStatus), module); } if (currentStatus == Status.STATUS_ACTIVE) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Active transaction in place, so no transaction begun", module); + Debug.logVerbose("Active transaction in place, so no transaction begun", module); } return false; } else if (currentStatus == Status.STATUS_MARKED_ROLLBACK) { @@ -182,14 +182,14 @@ public final class TransactionUtil imple if (timeout > 0) { ut.setTransactionTimeout(timeout); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Set transaction timeout to : " + timeout + " seconds", module); + Debug.logVerbose("Set transaction timeout to : " + timeout + " seconds", module); } } // begin the transaction ut.begin(); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Transaction begun", module); + Debug.logVerbose("Transaction begun", module); } // reset the timeout to the default Modified: ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entityext/src/main/java/org/apache/ofbiz/entityext/eca/EntityEcaRule.java Wed Dec 13 14:11:38 2017 @@ -83,7 +83,7 @@ public final class EntityEcaRule impleme actionsAndSets.trimToSize(); this.actionsAndSets = Collections.unmodifiableList(actionsAndSets); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Conditions: " + conditions, module); + Debug.logVerbose("Conditions: " + conditions, module); if (Debug.verboseOn()) Debug.logVerbose("actions and sets (intermixed): " + actionsAndSets, module); } } Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/SetServiceFields.java Wed Dec 13 14:11:38 2017 @@ -87,7 +87,7 @@ public final class SetServiceFields exte Map<String, ? extends Object> fromMap = mapFma.get(methodContext.getEnvMap()); if (fromMap == null) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("The from map in set-service-field was not found with name: " + mapFma, module); + Debug.logVerbose("The from map in set-service-field was not found with name: " + mapFma, module); } return true; } Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Iterate.java Wed Dec 13 14:11:38 2017 @@ -151,7 +151,7 @@ public final class Iterate extends Metho } } else { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Cannot iterate over a " + objList == null ? "null object" : objList.getClass().getName() + Debug.logVerbose("Cannot iterate over a " + objList == null ? "null object" : objList.getClass().getName() + ", doing nothing: " + this, module); } return true; Modified: ofbiz/ofbiz-framework/trunk/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/security/src/main/java/org/apache/ofbiz/security/SecurityFactory.java Wed Dec 13 14:11:38 2017 @@ -75,7 +75,7 @@ public final class SecurityFactory { security.setDelegator(delegator); security = authorizationCache.putIfAbsentAndGet(delegator.getDelegatorName(), security); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Security implementation " + security.getClass().getName() + " created for delegator " + delegator.getDelegatorName(), module); + Debug.logVerbose("Security implementation " + security.getClass().getName() + " created for delegator " + delegator.getDelegatorName(), module); } } return security; Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericAbstractDispatcher.java Wed Dec 13 14:11:38 2017 @@ -71,7 +71,7 @@ public abstract class GenericAbstractDis getJobManager().schedule(jobName, poolName, serviceName, context, startTime, frequency, interval, count, endTime, maxRetry); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("[LocalDispatcher.schedule] : Current time : " + (new Date()).getTime(), module); + Debug.logVerbose("[LocalDispatcher.schedule] : Current time : " + (new Date()).getTime(), module); if (Debug.verboseOn()) Debug.logVerbose("[LocalDispatcher.schedule] : Runtime : " + startTime, module); if (Debug.verboseOn()) Debug.logVerbose("[LocalDispatcher.schedule] : Frequency : " + frequency, module); if (Debug.verboseOn()) Debug.logVerbose("[LocalDispatcher.schedule] : Interval : " + interval, module); Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceInfo.java Wed Dec 13 14:11:38 2017 @@ -205,7 +205,7 @@ public class RecurrenceInfo { } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Date List Size: " + (rDateList == null ? 0 : rDateList.size()), module); + Debug.logVerbose("Date List Size: " + (rDateList == null ? 0 : rDateList.size()), module); if (Debug.verboseOn()) Debug.logVerbose("Rule List Size: " + (rRulesList == null ? 0 : rRulesList.size()), module); } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpressions.java Wed Dec 13 14:11:38 2017 @@ -68,7 +68,7 @@ public class TemporalExpressions impleme this.range = new org.apache.ofbiz.base.util.DateRange(start, end); this.sequence = SEQUENCE_DATE_RANGE; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); + Debug.logVerbose("Created " + this, module); } } @@ -162,7 +162,7 @@ public class TemporalExpressions impleme } this.sequence = SEQUENCE_DAY_IN_MONTH + (result * 10) + dayOfWeek; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); + Debug.logVerbose("Created " + this, module); } } @@ -313,7 +313,7 @@ public class TemporalExpressions impleme this.start = start; this.end = end; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); + Debug.logVerbose("Created " + this, module); } } @@ -433,7 +433,7 @@ public class TemporalExpressions impleme this.start = start; this.end = end; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); + Debug.logVerbose("Created " + this, module); } } @@ -565,7 +565,7 @@ public class TemporalExpressions impleme } this.sequence = included.sequence; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); + Debug.logVerbose("Created " + this, module); } } @@ -685,7 +685,7 @@ public class TemporalExpressions impleme this.freqType = freqType; this.freqCount = freqCount; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); + Debug.logVerbose("Created " + this, module); } } @@ -844,7 +844,7 @@ public class TemporalExpressions impleme this.end = end; this.sequence = SEQUENCE_HOUR_RANGE + start; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); + Debug.logVerbose("Created " + this, module); } } @@ -997,7 +997,7 @@ public class TemporalExpressions impleme this.sequence = result; } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); + Debug.logVerbose("Created " + this, module); } } @@ -1129,7 +1129,7 @@ public class TemporalExpressions impleme this.end = end; this.sequence = SEQUENCE_MINUTE_RANGE + start; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); + Debug.logVerbose("Created " + this, module); } } @@ -1280,7 +1280,7 @@ public class TemporalExpressions impleme this.start = start; this.end = end; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); + Debug.logVerbose("Created " + this, module); } } @@ -1437,7 +1437,7 @@ public class TemporalExpressions impleme } this.sequence = included.sequence; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); + Debug.logVerbose("Created " + this, module); } } @@ -1555,7 +1555,7 @@ public class TemporalExpressions impleme this.sequence = that.sequence; } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); + Debug.logVerbose("Created " + this, module); } } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java Wed Dec 13 14:11:38 2017 @@ -70,7 +70,7 @@ public final class ServiceEcaRule implem } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Conditions: " + conditions, module); + Debug.logVerbose("Conditions: " + conditions, module); } Set<String> nameSet = UtilMisc.toSet("set", "action"); @@ -83,7 +83,7 @@ public final class ServiceEcaRule implem } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("actions and sets (intermixed): " + actionsAndSets, module); + Debug.logVerbose("actions and sets (intermixed): " + actionsAndSets, module); } } @@ -141,7 +141,7 @@ public final class ServiceEcaRule implem break; } else { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("For Service ECA [" + this.serviceName + "] on [" + this.eventName + "] got true for condition: " + ec, module); + Debug.logVerbose("For Service ECA [" + this.serviceName + "] on [" + this.eventName + "] got true for condition: " + ec, module); } } } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/XMLRPCClientEngine.java Wed Dec 13 14:11:38 2017 @@ -120,7 +120,7 @@ public class XMLRPCClientEngine extends List<ModelParam> inModelParamList = modelService.getInModelParamList(); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("[XMLRPCClientEngine.invoke] : Parameter length - " + inModelParamList.size(), module); + Debug.logVerbose("[XMLRPCClientEngine.invoke] : Parameter length - " + inModelParamList.size(), module); for (ModelParam p: inModelParamList) { if (Debug.verboseOn()) Debug.logVerbose("[XMLRPCClientEngine.invoke} : Parameter: " + p.name + " (" + p.mode + ")", module); } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java Wed Dec 13 14:11:38 2017 @@ -114,7 +114,7 @@ public class PersistedServiceJob extends throw new InvalidJobException("Unable to set the startDateTime and statusId on the current job [" + getJobId() + "]; not running!", e); } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Placing job [" + getJobId() + "] in queue", module); + Debug.logVerbose("Placing job [" + getJobId() + "] in queue", module); } } @@ -141,7 +141,7 @@ public class PersistedServiceJob extends throw new InvalidJobException("Unable to set the startDateTime and statusId on the current job [" + getJobId() + "]; not running!", e); } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Job [" + getJobId() + "] running", module); + Debug.logVerbose("Job [" + getJobId() + "] running", module); } // configure any additional recurrences long maxRecurrenceCount = -1; @@ -365,7 +365,7 @@ public class PersistedServiceJob extends throw new InvalidJobException("Unable to dequeue job [" + getJobId() + "]", e); } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Job [" + getJobId() + "] not queued, rescheduling", module); + Debug.logVerbose("Job [" + getJobId() + "] not queued, rescheduling", module); } } Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java Wed Dec 13 14:11:38 2017 @@ -127,7 +127,7 @@ public class ServiceEventHandler impleme } if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("[Processing]: SERVICE Event", module); + Debug.logVerbose("[Processing]: SERVICE Event", module); if (Debug.verboseOn()) Debug.logVerbose("[Using delegator]: " + dispatcher.getDelegator().getDelegatorName(), module); } Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java Wed Dec 13 14:11:38 2017 @@ -129,7 +129,7 @@ public class WidgetFactory { Assert.notNull("tagName", tagName, "widgetClass", widgetClass); screenWidgets.put(tagName, widgetClass.getConstructor(ModelScreen.class, Element.class)); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Registered " + widgetClass.getName() + " with tag name " + tagName, module); + Debug.logVerbose("Registered " + widgetClass.getName() + " with tag name " + tagName, module); } } Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java Wed Dec 13 14:11:38 2017 @@ -74,12 +74,12 @@ public final class UtilHelpText { if (fieldDescription.equals(messageId)) { messageId = "FieldDescription." + fieldName; if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("No help text found in [" + entityResourceName + "] with key [" + messageId + "], Trying with: " + messageId, module); + Debug.logVerbose("No help text found in [" + entityResourceName + "] with key [" + messageId + "], Trying with: " + messageId, module); } fieldDescription = UtilProperties.getMessage(entityResourceName, messageId, locale); if (fieldDescription.equals(messageId)) { if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("No help text found in [" + entityResourceName + "] with key [" + messageId + "]", module); + Debug.logVerbose("No help text found in [" + entityResourceName + "] with key [" + messageId + "]", module); } return ""; } Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java?rev=1818020&r1=1818019&r2=1818020&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java Wed Dec 13 14:11:38 2017 @@ -130,7 +130,7 @@ public class MacroMenuRenderer implement } sb.append(" />"); if (Debug.verboseOn()) { - if (Debug.verboseOn()) Debug.logVerbose("Executing macro: " + sb, module); + Debug.logVerbose("Executing macro: " + sb, module); } executeMacro(writer, sb.toString()); } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |