svn commit: r1818005 [1/3] - in /ofbiz: ofbiz-framework/trunk/applicat
Locked
svn commit: r1818005 [1/3] - in /ofbiz: ofbiz-framework/trunk/applicat
 
|
Author: jleroux
Date: Wed Dec 13 12:43:05 2017 New Revision: 1818005 URL: http://svn.apache.org/viewvc?rev=1818005&view=rev Log: Improved: Always check if debug verbose is on when using Debug.logVerbose() (OFBIZ-10052) We discussed on this point: http://markmail.org/message/mplvusuqn7oshl4v and we agreed about better doing a check when using Debug.logVerbose(). I checked there are 300+ cases like that. Since it's an easy S/R This implements it 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/payment/GiftCertificateServices.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/ideal/IdealEvents.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.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/EditRenderSubContentCacheTransform.java ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/RenderContentAsText.java ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.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/HttpClient.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/SSLUtil.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/UelFunctions.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/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.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/GenericDelegator.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/connection/DebugManagedDataSource.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/TransactionUtil.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.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/SimpleMethod.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.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/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.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/GenericDispatcherFactory.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.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/RecurrenceRule.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/group/GroupModel.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/control/ConfigXMLReader.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.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/model/AbstractModelAction.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeAction.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.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 ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java ofbiz/ofbiz-plugins/trunk/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -164,7 +164,7 @@ public class InvoiceServices { String invoiceId = (String) context.get("invoiceId"); if (UtilValidate.isEmpty(billItems)) { - Debug.logVerbose("No order items to invoice; not creating invoice; returning success", module); + if (Debug.verboseOn()) Debug.logVerbose("No order items to invoice; not creating invoice; returning success", module); return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource, "AccountingNoOrderItemsToInvoice", locale)); } @@ -1977,7 +1977,7 @@ public class InvoiceServices { String returnId = entry.getKey(); List<GenericValue> billItems = entry.getValue(); if (Debug.verboseOn()) { - Debug.logVerbose("Creating invoice for return [" + returnId + "] with items: " + billItems.toString(), module); + if (Debug.verboseOn()) 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); @@ -2157,7 +2157,7 @@ public class InvoiceServices { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(serviceResults)); } if (Debug.verboseOn()) { - Debug.logVerbose("Creating Invoice Item with amount " + returnPrice + " and quantity " + quantity + if (Debug.verboseOn()) Debug.logVerbose("Creating Invoice Item with amount " + returnPrice + " and quantity " + quantity + " for shipment [" + item.getString("shipmentId") + ":" + item.getString("shipmentItemSeqId") + "]", module); } @@ -2203,7 +2203,7 @@ public class InvoiceServices { BigDecimal amount = adjustment.getBigDecimal("amount"); amount = amount.multiply(ratio).setScale(DECIMALS, ROUNDING); if (Debug.verboseOn()) { - Debug.logVerbose("Creating Invoice Item with amount " + adjustment.getBigDecimal("amount") + " prorated to " + amount + if (Debug.verboseOn()) Debug.logVerbose("Creating Invoice Item with amount " + adjustment.getBigDecimal("amount") + " prorated to " + amount + " for return adjustment [" + adjustment.getString("returnAdjustmentId") + "]", module); } @@ -2263,7 +2263,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()) { - Debug.logVerbose("Creating Invoice Item with amount " + adjustment.getBigDecimal("amount") + " prorated to " + amount + if (Debug.verboseOn()) Debug.logVerbose("Creating Invoice Item with amount " + adjustment.getBigDecimal("amount") + " prorated to " + amount + " for return adjustment [" + adjustment.getString("returnAdjustmentId") + "]", module); } @@ -2381,8 +2381,8 @@ public class InvoiceServices { if (totalPayments.signum() == 1) { BigDecimal invoiceTotal = InvoiceWorker.getInvoiceTotal(delegator, invoiceId); if (Debug.verboseOn()) { - Debug.logVerbose("Invoice #" + invoiceId + " total: " + invoiceTotal, module); - Debug.logVerbose("Total payments : " + totalPayments, module); + if (Debug.verboseOn()) 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 // this invoice is paid Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java Wed Dec 13 12:43:05 2017 @@ -1291,7 +1291,7 @@ public class GiftCertificateServices { return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, "OrderErrorCreateReturnItemWithoutId", locale)); } else { - Debug.logVerbose("Created return item : " + returnId + " / " + returnItemSeqId, module); + if (Debug.verboseOn()) Debug.logVerbose("Created return item : " + returnId + " / " + returnItemSeqId, module); } // need the system userLogin to "fake" out the update service 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -889,7 +889,7 @@ public class CCPaymentServices { throw new ClearCommerceException("Missing server URL; check your ClearCommerce configuration"); } if (Debug.verboseOn()) { - Debug.logVerbose("ClearCommerce server URL: " + serverURL, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("ClearCommerce XML request string: " + xmlString, module); + if (Debug.verboseOn()) Debug.logVerbose("ClearCommerce XML request string: " + xmlString, module); } HttpClient http = new HttpClient(serverURL); @@ -925,7 +925,7 @@ public class CCPaymentServices { } if (Debug.verboseOn()) Debug.logVerbose("Result severity from clearCommerce:" + getMessageListMaxSev(responseDocument), module); if (Debug.verboseOn() && getMessageListMaxSev(responseDocument) > 4) - Debug.logVerbose("Returned messages:" + getMessageList(responseDocument),module); + if (Debug.verboseOn()) Debug.logVerbose("Returned messages:" + getMessageList(responseDocument),module); return responseDocument; } Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/ideal/IdealEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/ideal/IdealEvents.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/ideal/IdealEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/ideal/IdealEvents.java Wed Dec 13 12:43:05 2017 @@ -304,7 +304,7 @@ public class IdealEvents { } private static boolean setPaymentPreferences(Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, String orderId, HttpServletRequest request) { - Debug.logVerbose("Setting payment prefrences..", module); + if (Debug.verboseOn()) Debug.logVerbose("Setting payment prefrences..", module); List <GenericValue> paymentPrefs = null; try { paymentPrefs = EntityQuery.use(delegator).from("OrderPaymentPreference") 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -173,7 +173,7 @@ public class PayflowPro { } if (Debug.verboseOn()) { - Debug.logVerbose("Response from Verisign: " + resp, module); + if (Debug.verboseOn()) 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/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java Wed Dec 13 12:43:05 2017 @@ -401,7 +401,7 @@ public class WorldPayEvents { } private static boolean setPaymentPreferences(Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, String orderId, HttpServletRequest request) { - Debug.logVerbose("Setting payment preferences..", module); + if (Debug.verboseOn()) Debug.logVerbose("Setting payment preferences..", module); List<GenericValue> paymentPrefs = null; try { paymentPrefs = EntityQuery.use(delegator).from("OrderPaymentPreference") Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java Wed Dec 13 12:43:05 2017 @@ -248,11 +248,11 @@ public class CmsEvents { } if (errorPage != null) { if (Debug.verboseOn()) - Debug.logVerbose("Found error pages " + statusCode + " : " + errorPage, module); + if (Debug.verboseOn()) Debug.logVerbose("Found error pages " + statusCode + " : " + errorPage, module); contentId = errorPage.getString("contentId"); } else { if (Debug.verboseOn()) - Debug.logVerbose("No specific error page, falling back to the Error Container for " + statusCode, module); + if (Debug.verboseOn()) Debug.logVerbose("No specific error page, falling back to the Error Container for " + statusCode, module); contentId = errorContainer.getString("contentId"); } mapKey = null; @@ -263,7 +263,7 @@ public class CmsEvents { try { GenericValue errorPage = EntityQuery.use(delegator).from("Content").where("contentId", "CONTENT_ERROR_" + statusCode).cache().queryOne(); if (errorPage != null) { - Debug.logVerbose("Found generic page " + statusCode, module); + if (Debug.verboseOn()) Debug.logVerbose("Found generic page " + statusCode, module); contentId = errorPage.getString("contentId"); mapKey = null; hasErrorPage = true; Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentServicesComplex.java Wed Dec 13 12:43:05 2017 @@ -140,7 +140,7 @@ public class ContentServicesComplex { } for (int i=0; i < relatedAssocs.size(); i++) { GenericValue a = relatedAssocs.get(i); - Debug.logVerbose(" contentId:" + a.get("contentId") + " To:" + a.get("caContentIdTo") + " fromDate:" + a.get("caFromDate") + " thruDate:" + a.get("caThruDate") + " AssocTypeId:" + a.get("caContentAssocTypeId"), null); + if (Debug.verboseOn()) Debug.logVerbose(" contentId:" + a.get("contentId") + " To:" + a.get("caContentIdTo") + " fromDate:" + a.get("caFromDate") + " thruDate:" + a.get("caThruDate") + " AssocTypeId:" + a.get("caContentAssocTypeId"), null); } Map<String, Object> results = new HashMap<String, Object>(); results.put("entityList", relatedAssocs); 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -364,7 +364,7 @@ public class DataServices { } String textData = (String) context.get("textData"); if (Debug.verboseOn()) { - Debug.logVerbose("in updateElectronicText, textData:" + textData, module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -173,7 +173,7 @@ public class LayoutEvents { return "error"; } String imageFileName = (String) uploadResults.get("imageFileName"); - Debug.logVerbose("in createLayoutImage(java), context:" + context, ""); + if (Debug.verboseOn()) Debug.logVerbose("in createLayoutImage(java), context:" + context, ""); context.put("userLogin", session.getAttribute("userLogin")); context.put("dataResourceTypeId", "IMAGE_OBJECT"); context.put("contentAssocTypeId", "SUB_CONTENT"); @@ -185,13 +185,13 @@ public class LayoutEvents { context.put("drDataResourceTypeId", null); String dataResourceId = (String) context.get("drDataResourceId"); - Debug.logVerbose("in createLayoutImage(java), dataResourceId:" + dataResourceId, ""); + if (Debug.verboseOn()) Debug.logVerbose("in createLayoutImage(java), dataResourceId:" + dataResourceId, ""); GenericValue dataResource = EntityQuery.use(delegator).from("DataResource").where("dataResourceId", dataResourceId).queryOne(); - Debug.logVerbose("in createLayoutImage(java), dataResource:" + dataResource, ""); + if (Debug.verboseOn()) Debug.logVerbose("in createLayoutImage(java), dataResource:" + dataResource, ""); // Use objectInfo field to store the name of the file, since there is no // place in ImageDataResource for it. - Debug.logVerbose("in createLayoutImage(java), imageFileName:" + imageFileName, ""); + if (Debug.verboseOn()) Debug.logVerbose("in createLayoutImage(java), imageFileName:" + imageFileName, ""); if (dataResource != null) { dataResource.setNonPKFields(context); dataResource.store(); @@ -220,7 +220,7 @@ public class LayoutEvents { Locale locale = UtilHttp.getLocale(request); Map<String, Object> context = new HashMap<String, Object>(); Map<String, Object> paramMap = UtilHttp.getParameterMap(request); - Debug.logVerbose("in replaceSubContent, paramMap:" + paramMap, module); + if (Debug.verboseOn()) Debug.logVerbose("in replaceSubContent, paramMap:" + paramMap, module); String dataResourceId = (String) paramMap.get("dataResourceId"); if (UtilValidate.isEmpty(dataResourceId)) { String errMsg = UtilProperties.getMessage(LayoutEvents.err_resource, "layoutEvents.data_ressource_id_null", locale); @@ -276,14 +276,14 @@ public class LayoutEvents { Locale locale = UtilHttp.getLocale(request); Map<String, Object> paramMap = UtilHttp.getParameterMap(request); String contentId = (String) paramMap.get("contentId"); - Debug.logVerbose("in cloneLayout, contentId:" + contentId, ""); + if (Debug.verboseOn()) Debug.logVerbose("in cloneLayout, contentId:" + contentId, ""); if (UtilValidate.isEmpty(contentId)) { String errMsg = UtilProperties.getMessage(LayoutEvents.err_resource, "layoutEvents.content_id_empty", locale); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } String contentIdTo = (String) paramMap.get("contentIdTo"); - Debug.logVerbose("in cloneLayout, contentIdTo:" + contentIdTo, ""); + if (Debug.verboseOn()) Debug.logVerbose("in cloneLayout, contentIdTo:" + contentIdTo, ""); GenericValue content = null; GenericValue newContent = null; GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); @@ -293,14 +293,14 @@ public class LayoutEvents { String newDataResourceId = null; try { content = EntityQuery.use(delegator).from("Content").where("contentId", contentId).queryOne(); - Debug.logVerbose("in cloneLayout, content:" + content, ""); + if (Debug.verboseOn()) Debug.logVerbose("in cloneLayout, content:" + content, ""); if (content == null) { String errMsg = UtilProperties.getMessage(LayoutEvents.err_resource, "layoutEvents.content_empty", locale); request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } newContent = delegator.makeValue("Content", content); - Debug.logVerbose("in cloneLayout, newContent:" + newContent, ""); + if (Debug.verboseOn()) Debug.logVerbose("in cloneLayout, newContent:" + newContent, ""); String oldName = (String) content.get("contentName"); newId = delegator.getNextSeqId("Content"); newContent.set("contentId", newId); @@ -308,7 +308,7 @@ public class LayoutEvents { GenericValue dataResource = EntityQuery.use(delegator).from("DataResource").where("dataResourceId", dataResourceId).queryOne(); if (dataResource != null) { GenericValue newDataResource = delegator.makeValue("DataResource", dataResource); - Debug.logVerbose("in cloneLayout, newDataResource:" + newDataResource, ""); + if (Debug.verboseOn()) Debug.logVerbose("in cloneLayout, newDataResource:" + newDataResource, ""); String dataResourceName = "Copy:" + (String) dataResource.get("dataResourceName"); newDataResource.set("dataResourceName", dataResourceName); newDataResourceId = delegator.getNextSeqId("DataResource"); @@ -325,7 +325,7 @@ public class LayoutEvents { newContent.set("createdByUserLogin", userLoginId); newContent.set("lastModifiedByUserLogin", userLoginId); newContent.create(); - Debug.logVerbose("in cloneLayout, newContent:" + newContent, ""); + if (Debug.verboseOn()) Debug.logVerbose("in cloneLayout, newContent:" + newContent, ""); GenericValue newContentAssoc = delegator.makeValue("ContentAssoc"); newContentAssoc.set("contentId", newId); @@ -333,7 +333,7 @@ public class LayoutEvents { newContentAssoc.set("contentAssocTypeId", "SUB_CONTENT"); newContentAssoc.set("fromDate", UtilDateTime.nowTimestamp()); newContentAssoc.create(); - Debug.logVerbose("in cloneLayout, newContentAssoc:" + newContentAssoc, ""); + if (Debug.verboseOn()) Debug.logVerbose("in cloneLayout, newContentAssoc:" + newContentAssoc, ""); } catch (GenericEntityException e) { request.setAttribute("_ERROR_MESSAGE_", e.getMessage()); return "error"; @@ -382,7 +382,7 @@ public class LayoutEvents { String mapKey = (String) view.get("caMapKey"); Timestamp fromDate = (Timestamp) view.get("caFromDate"); Timestamp thruDate = (Timestamp) view.get("caThruDate"); - Debug.logVerbose("in cloneLayout, contentIdFrom:" + contentIdFrom + " fromDate:" + fromDate + " thruDate:" + thruDate + " mapKey:" + mapKey, ""); + if (Debug.verboseOn()) Debug.logVerbose("in cloneLayout, contentIdFrom:" + contentIdFrom + " fromDate:" + fromDate + " thruDate:" + thruDate + " mapKey:" + mapKey, ""); if (beenThere.get(contentIdFrom) == null) { serviceIn.put("contentIdFrom", contentIdFrom); serviceIn.put("contentIdTo", newId); @@ -401,7 +401,7 @@ public class LayoutEvents { GenericValue view = delegator.makeValue("ContentDataResourceView"); view.set("contentId", newId); view.set("drDataResourceId", newDataResourceId); - Debug.logVerbose("in cloneLayout, view:" + view, ""); + if (Debug.verboseOn()) Debug.logVerbose("in cloneLayout, view:" + view, ""); ContentManagementWorker.setCurrentEntityMap(request, view); request.setAttribute("contentId", view.get("contentId")); request.setAttribute("drDataResourceId", view.get("drDataResourceId")); @@ -416,8 +416,8 @@ public class LayoutEvents { String contentIdTo = (String) paramMap.get("contentIdTo"); String mapKey = (String) paramMap.get("mapKey"); if (Debug.verboseOn()) { - Debug.logVerbose("in createSubContent, contentIdTo:" + contentIdTo, module); - Debug.logVerbose("in createSubContent, mapKey:" + mapKey, module); + if (Debug.verboseOn()) 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>(); List<Object> errorMessages = new LinkedList<>(); @@ -449,7 +449,7 @@ public class LayoutEvents { context.put("textData", paramMap.get("textData")); context.put("contentAssocTypeId", "SUB_CONTENT"); if (Debug.verboseOn()) { - Debug.logVerbose("in createSubContent, context:" + context, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("in createLayoutFile, result:" + result, module); + if (Debug.verboseOn()) Debug.logVerbose("in createLayoutFile, result:" + result, module); } String contentId = (String) result.get("contentId"); String dataResourceId = (String) result.get("dataResourceId"); @@ -553,8 +553,8 @@ public class LayoutEvents { if (attrVal == null) { attrVal = (String) paramMap.get(attrName); } - Debug.logVerbose("in copyToClip, attrName:" + attrName,""); - Debug.logVerbose("in copyToClip, attrVal:" + attrVal,""); + if (Debug.verboseOn()) Debug.logVerbose("in copyToClip, attrName:" + attrName,""); + if (Debug.verboseOn()) Debug.logVerbose("in copyToClip, attrVal:" + attrVal,""); if (UtilValidate.isNotEmpty(attrVal)) { passedPK.put(attrName,attrVal); } else { Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java Wed Dec 13 12:43:05 2017 @@ -162,7 +162,7 @@ public class EditRenderSubContentCacheTr if (Debug.verboseOn()) { for (Entry<String, Object> ky : templateCtx.entrySet()) { Object val = ky.getValue();; - Debug.logVerbose("context key: " + ky + " val: " + val, module); + if (Debug.verboseOn()) Debug.logVerbose("context key: " + ky + " val: " + val, module); } } 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=1818005&r1=1818004&r2=1818005&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 12:43:05 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()) { - Debug.logVerbose("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("in Render(0), directAssocMode ." + directAssocMode , module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Render close, globalNodeTrail(2a):" + ContentWorker.nodeTrailToCsv(globalNodeTrail), ""); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("in Render(3), editRequestName ." + editRequestName , module); + if (Debug.verboseOn()) Debug.logVerbose("in Render(3), editRequestName ." + editRequestName , module); } if (UtilValidate.isNotEmpty(editRequestName)) { @@ -122,8 +122,8 @@ public class RenderContentAsText impleme } if (Debug.verboseOn()) { - Debug.logVerbose("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module); - Debug.logVerbose("in RenderSubContent, subContentId(2):" + templateRoot.get("subContentId"), module); + if (Debug.verboseOn()) 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); try { Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java Wed Dec 13 12:43:05 2017 @@ -4409,7 +4409,7 @@ public class OrderServices { } if (Debug.verboseOn()) - Debug.logVerbose("To Store Contains: " + toStore, module); + if (Debug.verboseOn()) Debug.logVerbose("To Store Contains: " + toStore, module); // remove any order item attributes that were set to empty try { Modified: ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java Wed Dec 13 12:43:05 2017 @@ -1165,7 +1165,7 @@ public class CommunicationEventServices part2Text = ""; } if (Debug.verboseOn()) - Debug.logVerbose("Part 2 Text :\n\n" + part2Text, module); + if (Debug.verboseOn()) Debug.logVerbose("Part 2 Text :\n\n" + part2Text, module); // find the "Action" element and obtain its value (looking for "failed") Pattern p2 = Pattern.compile("^Action: (.*)$", Pattern.MULTILINE | Pattern.CASE_INSENSITIVE); @@ -1182,7 +1182,7 @@ public class CommunicationEventServices part3Text = ""; } if (Debug.verboseOn()) - Debug.logVerbose("Part 3 Text :\n\n" + part3Text, module); + if (Debug.verboseOn()) Debug.logVerbose("Part 3 Text :\n\n" + part3Text, module); // find the "Message-Id" element and obtain its value (looking for "failed") Pattern p3 = Pattern.compile("^Message-Id: (.*)$", Pattern.MULTILINE | Pattern.CASE_INSENSITIVE); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java Wed Dec 13 12:43:05 2017 @@ -176,7 +176,7 @@ public class SeoTransform implements Tem } } if (!foundMatch) { - Debug.logVerbose("Can NOT find a seo transform pattern for this url: " + url, module); + if (Debug.verboseOn()) Debug.logVerbose("Can NOT find a seo transform pattern for this url: " + url, module); } } return url; Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java Wed Dec 13 12:43:05 2017 @@ -178,7 +178,7 @@ public class UrlRegexpTransform implemen } } if (!foundMatch) { - Debug.logVerbose("Can NOT find a seo transform pattern for this url: " + url, module); + if (Debug.verboseOn()) Debug.logVerbose("Can NOT find a seo transform pattern for this url: " + url, module); } } return url; 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -730,7 +730,7 @@ public class InventoryServices { } if (Debug.verboseOn()) { - Debug.logVerbose("productIdTo = " + productIdTo + " assocQuantity = " + assocQuantity + "current QOH " + currentQuantityOnHandTotal + + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -982,10 +982,10 @@ public class PriceServices { } if (Debug.verboseOn()) { - Debug.logVerbose("Unchecked Calculated price: " + price, module); - Debug.logVerbose("PriceInfo:", module); + if (Debug.verboseOn()) Debug.logVerbose("Unchecked Calculated price: " + price, module); + if (Debug.verboseOn()) Debug.logVerbose("PriceInfo:", module); for (GenericValue orderItemPriceInfo: orderItemPriceInfos) { - Debug.logVerbose(" --- " + orderItemPriceInfo.toString(), module); + 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -121,8 +121,8 @@ public class DhlServices { } if (Debug.verboseOn()) { - Debug.logVerbose("DHL Connect URL : " + conStr, module); - Debug.logVerbose("DHL XML String : " + xmlString, module); + if (Debug.verboseOn()) Debug.logVerbose("DHL Connect URL : " + conStr, module); + if (Debug.verboseOn()) Debug.logVerbose("DHL XML String : " + xmlString, module); } HttpClient http = new HttpClient(conStr); @@ -141,7 +141,7 @@ public class DhlServices { "FacilityShipmentDhlReceivedNullResponse", locale)); } if (Debug.verboseOn()) { - Debug.logVerbose("DHL Response : " + response, module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -118,8 +118,8 @@ public class FedexServices { } if (Debug.verboseOn()) { - Debug.logVerbose("Fedex Connect URL : " + url, module); - Debug.logVerbose("Fedex XML String : " + xmlString, module); + if (Debug.verboseOn()) Debug.logVerbose("Fedex Connect URL : " + url, module); + if (Debug.verboseOn()) Debug.logVerbose("Fedex XML String : " + xmlString, module); } HttpClient http = new HttpClient(url); @@ -138,7 +138,7 @@ public class FedexServices { "FacilityShipmentFedexReceivedNullResponse", locale)); } if (Debug.verboseOn()) { - Debug.logVerbose("Fedex Response : " + response, module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -421,7 +421,7 @@ public class LoginEvents { String cookieUsername = null; Cookie[] cookies = request.getCookies(); if (Debug.verboseOn()) { - Debug.logVerbose("Cookies:" + Arrays.toString(cookies), module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -368,9 +368,9 @@ public class ICalConverter { if (Debug.verboseOn()) { try { alarm.validate(true); - Debug.logVerbose("iCalendar alarm passes validation", module); + if (Debug.verboseOn()) Debug.logVerbose("iCalendar alarm passes validation", module); } catch (ValidationException e) { - Debug.logVerbose("iCalendar alarm fails validation: " + e, module); + if (Debug.verboseOn()) Debug.logVerbose("iCalendar alarm fails validation: " + e, module); } } } @@ -413,9 +413,9 @@ public class ICalConverter { if (Debug.verboseOn()) { try { calendar.validate(true); - Debug.logVerbose("iCalendar passes validation", module); + if (Debug.verboseOn()) Debug.logVerbose("iCalendar passes validation", module); } catch (ValidationException e) { - Debug.logVerbose("iCalendar fails validation: " + e, module); + if (Debug.verboseOn()) Debug.logVerbose("iCalendar fails validation: " + e, module); } } return ICalWorker.createOkResponse(calendar.toString()); @@ -575,10 +575,10 @@ public class ICalConverter { boolean newCalendar = true; Calendar calendar = null; if (iCalData == null) { - Debug.logVerbose("iCalendar Data not found, creating new Calendar", module); + if (Debug.verboseOn()) Debug.logVerbose("iCalendar Data not found, creating new Calendar", module); calendar = new Calendar(); } else { - Debug.logVerbose("iCalendar Data found, using saved Calendar", module); + if (Debug.verboseOn()) Debug.logVerbose("iCalendar Data found, using saved Calendar", module); StringReader reader = new StringReader(iCalData); CalendarBuilder builder = new CalendarBuilder(); try { @@ -696,7 +696,7 @@ public class ICalConverter { } } if (Debug.verboseOn()) { - Debug.logVerbose("Processing calendar:\r\n" + calendar, module); + if (Debug.verboseOn()) Debug.logVerbose("Processing calendar:\r\n" + calendar, module); } String workEffortId = fromXProperty(calendar.getProperties(), workEffortIdXPropName); if (workEffortId == null) { @@ -921,7 +921,7 @@ public class ICalConverter { if (Debug.verboseOn()) { try { result.validate(true); - Debug.logVerbose("iCalendar component passes validation", module); + if (Debug.verboseOn()) Debug.logVerbose("iCalendar component passes validation", module); } catch (ValidationException e) { Debug.logVerbose(e, "iCalendar component fails validation: ", module); } 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -171,7 +171,7 @@ public final class ICalWorker { try { Document requestDocument = WebDavUtil.getDocumentFromRequest(request); if (Debug.verboseOn()) { - Debug.logVerbose("[handlePropFindRequest] PROPFIND body:\r\n" + UtilXml.writeXmlDocument(requestDocument), module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("[handlePropFindRequest] PROPFIND response:\r\n" + UtilXml.writeXmlDocument(responseDocument), module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Returning response: code = " + responseProps.statusCode + + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -459,7 +459,7 @@ public final class ComponentConfig { throw new ComponentException("Error reading container configurations for component: " + this.globalName, ce); } if (Debug.verboseOn()) { - Debug.logVerbose("Read component config : [" + rootLocation + "]", module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -55,7 +55,7 @@ public class ComponentResourceHandler im this.loaderName = loaderName; this.location = location; if (Debug.verboseOn()) { - Debug.logVerbose("Created " + this.toString(), module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 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()) { - Debug.logVerbose("Getting converter: " + key, module); + if (Debug.verboseOn()) Debug.logVerbose("Getting converter: " + key, module); } OUTER: do { @@ -195,7 +195,7 @@ OUTER: sb.append(targetClass.getName()); String key = sb.toString(); if (converterMap.putIfAbsent(key, converter) == null) { - Debug.logVerbose("Registered converter " + converter.getClass().getName(), module); + if (Debug.verboseOn()) Debug.logVerbose("Registered converter " + converter.getClass().getName(), module); } } 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -85,14 +85,14 @@ public class GroovyUtil { return null; } if (Debug.verboseOn()) { - Debug.logVerbose("Evaluating -- " + expression, module); - Debug.logVerbose("Using Context -- " + context, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Evaluated to -- " + o, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Cached Groovy script at: " + location, module); + if (Debug.verboseOn()) 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/HttpClient.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/HttpClient.java Wed Dec 13 12:43:05 2017 @@ -486,16 +486,16 @@ public class HttpClient { OutputStreamWriter out = new OutputStreamWriter(con.getOutputStream(), this.streamCharset != null ? this.streamCharset : "UTF-8")) { if (Debug.verboseOn() || debug) - Debug.logVerbose("Opened output stream", module); + if (Debug.verboseOn()) Debug.logVerbose("Opened output stream", module); if (arguments != null) { out.write(arguments); if (Debug.verboseOn() || debug) - Debug.logVerbose("Wrote arguements (parameters) : " + arguments, module); + if (Debug.verboseOn()) Debug.logVerbose("Wrote arguements (parameters) : " + arguments, module); } if (Debug.verboseOn() || debug) - Debug.logVerbose("Flushed and closed buffer", module); + if (Debug.verboseOn()) Debug.logVerbose("Flushed and closed buffer", module); } } 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -800,7 +800,7 @@ public class ObjectType { if (value instanceof java.util.Date) return false; if (Debug.verboseOn()) { - Debug.logVerbose("In ObjectType.isEmpty(Object value) returning false for " + value.getClass() + " Object.", module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -52,7 +52,7 @@ public class PatternFactory { } pattern = compiledPerl5Patterns.putIfAbsentAndGet(stringPattern, pattern); if (Debug.verboseOn()) { - Debug.logVerbose("Compiled and cached the pattern: '" + stringPattern, module); + if (Debug.verboseOn()) 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/SSLUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java Wed Dec 13 12:43:05 2017 @@ -134,7 +134,7 @@ public final class SSLUtil { List<KeyManager> newKeyManagers = Arrays.asList(getKeyManagers(ks, ksi.getPassword(), alias)); keyMgrs.addAll(newKeyManagers); if (Debug.verboseOn()) - Debug.logVerbose("Loaded another cert store, adding [" + newKeyManagers.size() + if (Debug.verboseOn()) Debug.logVerbose("Loaded another cert store, adding [" + newKeyManagers.size() + "] KeyManagers for alias [" + alias + "] and keystore: " + ksi.createResourceHandler() .getFullLocation(), module); } else { 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -108,7 +108,7 @@ public final class ScriptUtil { if (iter.hasNext()) { helperFactory = iter.next(); if (Debug.verboseOn()) { - Debug.logVerbose("ScriptHelper factory set to " + helperFactory.getClass().getName(), module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Compiled script " + filePath + " using engine " + engine.getClass().getName(), module); + if (Debug.verboseOn()) Debug.logVerbose("Compiled script " + filePath + " using engine " + engine.getClass().getName(), module); } } catch (ClassCastException e) { if (Debug.verboseOn()) { - Debug.logVerbose("Script engine " + engine.getClass().getName() + " does not implement Compilable", module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Compiled script [" + script + "] using engine " + engine.getClass().getName(), module); + if (Debug.verboseOn()) Debug.logVerbose("Compiled script [" + script + "] using engine " + engine.getClass().getName(), module); } } catch (ClassCastException e) { if (Debug.verboseOn()) { - Debug.logVerbose("Script engine " + engine.getClass().getName() + " does not implement Compilable", module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Begin processing script [" + script + "] using engine " + engine.getClass().getName(), module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Invoking function/method " + functionName, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Begin processing script [" + filePath + "] using engine " + engine.getClass().getName(), module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -533,7 +533,7 @@ public class StringUtil { result = pattern.matcher(result).replaceAll(entry.getKey()); } if (Debug.verboseOn()) { - Debug.logVerbose("Converted " + expression + " to " + result, module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -159,7 +159,7 @@ public final class UtilHttp { } if (Debug.verboseOn()) { - Debug.logVerbose("Made Request Parameter Map with [" + paramMap.size() + "] Entries", module); + if (Debug.verboseOn()) 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,8 +319,8 @@ public final class UtilHttp { } if (Debug.verboseOn()) { - Debug.logVerbose("Made Request Attribute Map with [" + attributeMap.size() + "] Entries", module); - Debug.logVerbose("Request Attribute Map Entries: " + System.getProperty("line.separator") + UtilMisc.printMap(attributeMap), module); + if (Debug.verboseOn()) 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); } return attributeMap; @@ -354,8 +354,8 @@ public final class UtilHttp { } if (Debug.verboseOn()) { - Debug.logVerbose("Made Session Attribute Map with [" + sessionMap.size() + "] Entries", module); - Debug.logVerbose("Session Attribute Map Entries: " + System.getProperty("line.separator") + UtilMisc.printMap(sessionMap), module); + if (Debug.verboseOn()) 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); } return sessionMap; @@ -389,8 +389,8 @@ public final class UtilHttp { } if (Debug.verboseOn()) { - Debug.logVerbose("Made ServletContext Attribute Map with [" + servletCtxMap.size() + "] Entries", module); - Debug.logVerbose("ServletContext Attribute Map Entries: " + System.getProperty("line.separator") + UtilMisc.printMap(servletCtxMap), module); + if (Debug.verboseOn()) 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); } return servletCtxMap; 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -76,7 +76,7 @@ public final class FlexibleMapAccessor<T this.isAscending = isAscending; this.fse = fse; if (Debug.verboseOn()) { - Debug.logVerbose("FlexibleMapAccessor created, original = " + this.original, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("UEL exception while getting value: " + e + ", original = " + this.original, module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -602,7 +602,7 @@ public abstract class FlexibleStringExpa } } catch (PropertyNotFoundException e) { if (Debug.verboseOn()) { - Debug.logVerbose("Error evaluating expression: " + e, module); + if (Debug.verboseOn()) Debug.logVerbose("Error evaluating expression: " + e, module); } } catch (Exception e) { Debug.logError("Error evaluating expression: " + e, module); @@ -656,7 +656,7 @@ public abstract class FlexibleStringExpa return obj; } else { if (Debug.verboseOn()) { - Debug.logVerbose("Scriptlet evaluated to null [" + this + "].", module); + if (Debug.verboseOn()) Debug.logVerbose("Scriptlet evaluated to null [" + this + "].", module); } } } catch (Exception e) { @@ -691,7 +691,7 @@ public abstract class FlexibleStringExpa return UelUtil.evaluate(context, openBracket.concat(expr.toString()).concat(closeBracket)); } catch (PropertyNotFoundException e) { if (Debug.verboseOn()) { - Debug.logVerbose("Error evaluating expression: " + e, module); + if (Debug.verboseOn()) Debug.logVerbose("Error evaluating expression: " + e, module); } } catch (Exception e) { Debug.logError("Error evaluating expression: " + e, module); @@ -716,7 +716,7 @@ public abstract class FlexibleStringExpa obj = UelUtil.evaluate(context, new String(this.bracketedOriginal)); } catch (PropertyNotFoundException e) { if (Debug.verboseOn()) { - Debug.logVerbose("Error evaluating expression " + this + ": " + e, module); + if (Debug.verboseOn()) Debug.logVerbose("Error evaluating expression " + this + ": " + e, module); } } catch (Exception e) { Debug.logError("Error evaluating expression " + this + ": " + e, module); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |