svn commit: r1818005 [2/3] - in /ofbiz: ofbiz-framework/trunk/applicat
Locked
svn commit: r1818005 [2/3] - in /ofbiz: ofbiz-framework/trunk/applicat
 
|
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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -86,7 +86,7 @@ public class JuelConnector { if (base == null) { base = UelUtil.autoVivifyListOrMap(property); if (Debug.verboseOn()) { - Debug.logVerbose("ExtendedAstBracket.setValue auto-vivify base: " + base + ", property = " + property, module); + if (Debug.verboseOn()) Debug.logVerbose("ExtendedAstBracket.setValue auto-vivify base: " + base + ", property = " + property, module); } prefix.setValue(bindings, context, base); } @@ -120,7 +120,7 @@ public class JuelConnector { if (base == null) { base = UelUtil.autoVivifyListOrMap(property); if (Debug.verboseOn()) { - Debug.logVerbose("ExtendedAstDot.setValue auto-vivify base: " + base + ", property = " + property, module); + if (Debug.verboseOn()) 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/UelFunctions.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java Wed Dec 13 12:43:05 2017 @@ -264,7 +264,7 @@ public class UelFunctions { } catch (Exception e) { Debug.logError(e, "Error while initializing UelFunctions.Functions instance", module); } - Debug.logVerbose("UelFunctions.Functions loaded " + this.functionMap.size() + " functions", module); + if (Debug.verboseOn()) Debug.logVerbose("UelFunctions.Functions loaded " + this.functionMap.size() + " functions", module); } @Override public Method resolveFunction(String prefix, String localName) { 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=1818005&r1=1818004&r2=1818005&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 12:43:05 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()) { - Debug.logVerbose("UelUtil.setValue invoked, expression = " + expression + ", value = " + value, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("UelUtil.removeValue invoked, expression = " + expression , module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("ExtendedCompositeResolver.setValue: base = " + base + ", property = " + property + ", value = " + val, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("ExtendedListResolver.setValue adding List element: base = " + base + ", property = " + property + ", value = " + val, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("ExtendedListResolver.setValue inserting List element: base = " + base + ", property = " + property + ", value = " + val, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("ExtendedMapResolver.getValue: unable to find Locale for LocalizedMap element, using default locale", module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -144,7 +144,7 @@ public final class FreeMarkerWorker { String key = (String) i.next(); String className = props.getProperty(key); if (Debug.verboseOn()) { - Debug.logVerbose("Adding FTL Transform " + key + " with class " + className, module); + if (Debug.verboseOn()) Debug.logVerbose("Adding FTL Transform " + key + " with class " + className, module); } try { config.setSharedVariable(key, loader.loadClass(className).newInstance()); Modified: ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java Wed Dec 13 12:43:05 2017 @@ -115,8 +115,8 @@ public class CrossSubdomainSessionValve MessageBytes value = mimeHeaders.getValue(i); if (value.indexOf(cookie.getName()) >= 0) { String newCookieValue = request.getContext().getCookieProcessor().generateHeader(newCookie); - Debug.logVerbose("CrossSubdomainSessionValve: old Set-Cookie value: " + value.toString(), module); - Debug.logVerbose("CrossSubdomainSessionValve: new Set-Cookie value: " + newCookieValue, module); + if (Debug.verboseOn()) Debug.logVerbose("CrossSubdomainSessionValve: old Set-Cookie value: " + value.toString(), module); + if (Debug.verboseOn()) Debug.logVerbose("CrossSubdomainSessionValve: new Set-Cookie value: " + newCookieValue, module); value.setString(newCookieValue); } } Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java Wed Dec 13 12:43:05 2017 @@ -316,7 +316,7 @@ public class EmailServices { if (!"Y".equalsIgnoreCase(mailEnabled)) { // no error; just return as if we already processed Debug.logImportant("Mail notifications disabled in general.properties; mail with subject [" + subject + "] not sent to addressee [" + sendTo + "]", module); - Debug.logVerbose("What would have been sent, the addressee: " + sendTo + " subject: " + subject + " context: " + context, module); + if (Debug.verboseOn()) Debug.logVerbose("What would have been sent, the addressee: " + sendTo + " subject: " + subject + " context: " + context, module); results.put("messageWrapper", new MimeMessageWrapper(session, mail)); return results; } Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/login/LdapAuthenticationServices.java Wed Dec 13 12:43:05 2017 @@ -48,7 +48,7 @@ public class LdapAuthenticationServices public static final String module = LdapAuthenticationServices.class.getName(); public static boolean userLogin(DispatchContext ctx, Map<String, ?> context) { - Debug.logVerbose("Starting LDAP authentication", module); + if (Debug.verboseOn()) Debug.logVerbose("Starting LDAP authentication", module); Properties env = UtilProperties.getProperties("jndiLdap"); String username = (String) context.get("login.username"); if (username == null) { @@ -75,9 +75,9 @@ public class LdapAuthenticationServices if (dnTemplate != null) { dn = dnTemplate.replace("%u", username); } - Debug.logVerbose("Using DN template: " + dn, module); + if (Debug.verboseOn()) Debug.logVerbose("Using DN template: " + dn, module); } else { - Debug.logVerbose("Using UserLogin.userLdapDn: " + dn, module); + if (Debug.verboseOn()) Debug.logVerbose("Using UserLogin.userLdapDn: " + dn, module); } env.put(Context.SECURITY_PRINCIPAL, dn); env.put(Context.SECURITY_CREDENTIALS, password); @@ -86,10 +86,10 @@ public class LdapAuthenticationServices DirContext ldapCtx = new InitialDirContext(env); ldapCtx.close(); } catch (NamingException e) { - Debug.logVerbose("LDAP authentication failed: " + e.getMessage(), module); + if (Debug.verboseOn()) Debug.logVerbose("LDAP authentication failed: " + e.getMessage(), module); return false; } - Debug.logVerbose("LDAP authentication succeeded", module); + if (Debug.verboseOn()) Debug.logVerbose("LDAP authentication succeeded", module); if (!"true".equals(env.get("ldap.synchronize.passwords"))) { return true; } @@ -104,7 +104,7 @@ public class LdapAuthenticationServices samePassword = currentPassword.equals(password); } if (!samePassword) { - Debug.logVerbose("Starting password synchronization", module); + if (Debug.verboseOn()) Debug.logVerbose("Starting password synchronization", module); userLogin.set("currentPassword", useEncryption ? HashCrypt.cryptUTF8(LoginServices.getHashType(), null, password) : password, false); Transaction parentTx = null; boolean beganTransaction = false; @@ -127,7 +127,7 @@ public class LdapAuthenticationServices } finally { try { TransactionUtil.commit(beganTransaction); - Debug.logVerbose("Password synchronized", module); + if (Debug.verboseOn()) Debug.logVerbose("Password synchronized", module); } catch (GenericTransactionException e) { Debug.logError(e, "Could not commit nested transaction: " + e.getMessage(), module); } @@ -136,7 +136,7 @@ public class LdapAuthenticationServices if (parentTx != null) { try { TransactionUtil.resume(parentTx); - Debug.logVerbose("Resumed the parent transaction.", module); + if (Debug.verboseOn()) Debug.logVerbose("Resumed the parent transaction.", module); } catch (GenericTransactionException e) { Debug.logError(e, "Could not resume parent nested transaction: " + e.getMessage(), module); } 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -146,7 +146,7 @@ public final class ModelDataFileReader { ModelDataFile dataFile = createModelDataFile(curDataFile); result.put(dataFileName, dataFile); if (Debug.verboseOn()) { - Debug.logVerbose("Loaded dataFile: " + dataFileName, module); + if (Debug.verboseOn()) Debug.logVerbose("Loaded dataFile: " + dataFileName, module); } } return result; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java Wed Dec 13 12:43:05 2017 @@ -2654,7 +2654,7 @@ public class GenericDelegator implements Debug.logWarning(e, "DistributedCacheClear class with name " + distributedCacheClearClassName + " does not implement the DistributedCacheClear interface, distributed cache clearing will be disabled", module); } } else { - Debug.logVerbose("Distributed Cache Clear System disabled for delegator [" + delegatorFullName + "]", module); + if (Debug.verboseOn()) Debug.logVerbose("Distributed Cache Clear System disabled for delegator [" + delegatorFullName + "]", module); } return null; } 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=1818005&r1=1818004&r2=1818005&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 12:43:05 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()) { - Debug.logVerbose("Entity: " + this.getEntityName() + ", PK: " + this.getPrimaryKey().toString() + " -> char [" + curChar + "] replaced with [" + replacement + "]", module); + if (Debug.verboseOn()) 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/connection/DebugManagedDataSource.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java Wed Dec 13 12:43:05 2017 @@ -43,9 +43,9 @@ public class DebugManagedDataSource exte if (Debug.verboseOn()) { if (super.getPool() instanceof GenericObjectPool) { GenericObjectPool objectPool = (GenericObjectPool)super.getPool(); - Debug.logVerbose("Borrowing a connection from the pool; used/idle/total: " + objectPool.getNumActive() + "/" + objectPool.getNumIdle() + "/" + (objectPool.getNumActive() + objectPool.getNumIdle()) + "; min idle/max idle/max total: " + objectPool.getMinIdle() + "/" + objectPool.getMaxIdle() + "/" + objectPool.getMaxTotal(), module); + if (Debug.verboseOn()) Debug.logVerbose("Borrowing a connection from the pool; used/idle/total: " + objectPool.getNumActive() + "/" + objectPool.getNumIdle() + "/" + (objectPool.getNumActive() + objectPool.getNumIdle()) + "; min idle/max idle/max total: " + objectPool.getMinIdle() + "/" + objectPool.getMaxIdle() + "/" + objectPool.getMaxTotal(), module); } else { - Debug.logVerbose("Borrowing a connection from the pool; used/idle/total: " + super.getPool().getNumActive() + "/" + super.getPool().getNumIdle() + "/" + (super.getPool().getNumActive() + super.getPool().getNumIdle()), module); + if (Debug.verboseOn()) Debug.logVerbose("Borrowing a connection from the pool; used/idle/total: " + super.getPool().getNumActive() + "/" + super.getPool().getNumIdle() + "/" + (super.getPool().getNumActive() + super.getPool().getNumIdle()), module); } } return super.getConnection(); Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java Wed Dec 13 12:43:05 2017 @@ -591,7 +591,7 @@ public class GenericDAO { if (verboseOn) { // put this inside an if statement so that we don't have to generate the string when not used... - Debug.logVerbose("Doing selectListIteratorByCondition with whereEntityCondition: " + whereEntityCondition, module); + if (Debug.verboseOn()) Debug.logVerbose("Doing selectListIteratorByCondition with whereEntityCondition: " + whereEntityCondition, module); } // make two ArrayLists of fields, one for fields to select and the other for where clause fields (to find by) @@ -714,7 +714,7 @@ public class GenericDAO { if (verboseOn) { // put this inside an if statement so that we don't have to generate the string when not used... - Debug.logVerbose("Setting the whereEntityConditionParams: " + whereEntityConditionParams, module); + if (Debug.verboseOn()) Debug.logVerbose("Setting the whereEntityConditionParams: " + whereEntityConditionParams, module); } // set all of the values from the Where EntityCondition for (EntityConditionParam whereEntityConditionParam: whereEntityConditionParams) { @@ -722,7 +722,7 @@ public class GenericDAO { } if (verboseOn) { // put this inside an if statement so that we don't have to generate the string when not used... - Debug.logVerbose("Setting the havingEntityConditionParams: " + havingEntityConditionParams, module); + if (Debug.verboseOn()) Debug.logVerbose("Setting the havingEntityConditionParams: " + havingEntityConditionParams, module); } // set all of the values from the Having EntityCondition for (EntityConditionParam havingEntityConditionParam: havingEntityConditionParams) { @@ -963,7 +963,7 @@ public class GenericDAO { if (verboseOn) { // put this inside an if statement so that we don't have to generate the string when not used... - Debug.logVerbose("Doing selectListIteratorByCondition with whereEntityCondition: " + whereEntityCondition, module); + if (Debug.verboseOn()) Debug.logVerbose("Doing selectListIteratorByCondition with whereEntityCondition: " + whereEntityCondition, module); } boolean isGroupBy = false; @@ -1050,7 +1050,7 @@ public class GenericDAO { findOptions.getResultSetConcurrency(), findOptions.getFetchSize(), findOptions.getMaxRows()); if (verboseOn) { // put this inside an if statement so that we don't have to generate the string when not used... - Debug.logVerbose("Setting the whereEntityConditionParams: " + whereEntityConditionParams, module); + if (Debug.verboseOn()) Debug.logVerbose("Setting the whereEntityConditionParams: " + whereEntityConditionParams, module); } // set all of the values from the Where EntityCondition for (EntityConditionParam whereEntityConditionParam: whereEntityConditionParams) { @@ -1058,7 +1058,7 @@ public class GenericDAO { } if (verboseOn) { // put this inside an if statement so that we don't have to generate the string when not used... - Debug.logVerbose("Setting the havingEntityConditionParams: " + havingEntityConditionParams, module); + if (Debug.verboseOn()) Debug.logVerbose("Setting the havingEntityConditionParams: " + havingEntityConditionParams, module); } // set all of the values from the Having EntityCondition for (EntityConditionParam havingEntityConditionParam: havingEntityConditionParams) { Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java Wed Dec 13 12:43:05 2017 @@ -1027,7 +1027,7 @@ public class DatabaseUtil { private AbstractCountingCallable createPrimaryKeyFetcher(final DatabaseMetaData dbData, final String lookupSchemaName, final boolean needsUpperCase, final Map<String, Map<String, ColumnCheckInfo>> colInfo, final Collection<String> messages, final String curTable) { return new AbstractCountingCallable(null, null) { public AbstractCountingCallable call() throws Exception { - Debug.logVerbose("Fetching primary keys for " + curTable, module); + if (Debug.verboseOn()) Debug.logVerbose("Fetching primary keys for " + curTable, module); ResultSet rsPks = dbData.getPrimaryKeys(null, lookupSchemaName, curTable); count = checkPrimaryKeyInfo(rsPks, lookupSchemaName, needsUpperCase, colInfo, messages); return this; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/SQLProcessor.java Wed Dec 13 12:43:05 2017 @@ -281,15 +281,15 @@ public class SQLProcessor implements Aut Debug.logError(e, "Problems getting the connection's isolation level", module); } if (isoLevel == Connection.TRANSACTION_NONE) { - Debug.logVerbose("Transaction isolation level set to 'None'.", module); + if (Debug.verboseOn()) Debug.logVerbose("Transaction isolation level set to 'None'.", module); } else if (isoLevel == Connection.TRANSACTION_READ_COMMITTED) { - Debug.logVerbose("Transaction isolation level set to 'ReadCommited'.", module); + if (Debug.verboseOn()) Debug.logVerbose("Transaction isolation level set to 'ReadCommited'.", module); } else if (isoLevel == Connection.TRANSACTION_READ_UNCOMMITTED) { - Debug.logVerbose("Transaction isolation level set to 'ReadUncommitted'.", module); + if (Debug.verboseOn()) Debug.logVerbose("Transaction isolation level set to 'ReadUncommitted'.", module); } else if (isoLevel == Connection.TRANSACTION_REPEATABLE_READ) { - Debug.logVerbose("Transaction isolation level set to 'RepeatableRead'.", module); + if (Debug.verboseOn()) Debug.logVerbose("Transaction isolation level set to 'RepeatableRead'.", module); } else if (isoLevel == Connection.TRANSACTION_SERIALIZABLE) { - Debug.logVerbose("Transaction isolation level set to 'Serializable'.", module); + if (Debug.verboseOn()) Debug.logVerbose("Transaction isolation level set to 'Serializable'.", module); } } */ Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java Wed Dec 13 12:43:05 2017 @@ -180,10 +180,10 @@ public class ModelReader implements Seri // utilTimer.timerString(" After entityCache.put -- " + i + " --"); if (isEntity) { if (Debug.verboseOn()) - Debug.logVerbose("-- [Entity]: #" + i + ": " + entityName, module); + if (Debug.verboseOn()) Debug.logVerbose("-- [Entity]: #" + i + ": " + entityName, module); } else { if (Debug.verboseOn()) - Debug.logVerbose("-- [ViewEntity]: #" + i + ": " + entityName, module); + if (Debug.verboseOn()) Debug.logVerbose("-- [ViewEntity]: #" + i + ": " + entityName, module); } } else { Debug.logWarning("-- -- ENTITYGEN ERROR:getModelEntity: Could not create " + Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/transaction/JNDITransactionFactory.java Wed Dec 13 12:43:05 2017 @@ -179,7 +179,7 @@ public class JNDITransactionFactory impl if (ds != null) { if (Debug.verboseOn()) - Debug.logVerbose("Got a Datasource object.", module); + if (Debug.verboseOn()) Debug.logVerbose("Got a Datasource object.", module); dsCache.putIfAbsent(jndiName, ds); ds = dsCache.get(jndiName); Connection con; 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -122,11 +122,11 @@ public final class TransactionUtil imple try { int currentStatus = ut.getStatus(); if (Debug.verboseOn()) { - Debug.logVerbose("Current status : " + getTransactionStateString(currentStatus), module); + if (Debug.verboseOn()) Debug.logVerbose("Current status : " + getTransactionStateString(currentStatus), module); } if (currentStatus == Status.STATUS_ACTIVE) { if (Debug.verboseOn()) { - Debug.logVerbose("Active transaction in place, so no transaction begun", module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Set transaction timeout to : " + timeout + " seconds", module); + if (Debug.verboseOn()) Debug.logVerbose("Set transaction timeout to : " + timeout + " seconds", module); } } // begin the transaction ut.begin(); if (Debug.verboseOn()) { - Debug.logVerbose("Transaction begun", module); + if (Debug.verboseOn()) Debug.logVerbose("Transaction begun", module); } // reset the timeout to the default @@ -243,7 +243,7 @@ public final class TransactionUtil imple if (ut != null) { try { int status = ut.getStatus(); - Debug.logVerbose("Current status : " + getTransactionStateString(status), module); + if (Debug.verboseOn()) Debug.logVerbose("Current status : " + getTransactionStateString(status), module); if (status != STATUS_NO_TRANSACTION && status != STATUS_COMMITTING && status != STATUS_COMMITTED && status != STATUS_ROLLING_BACK && status != STATUS_ROLLEDBACK) { ut.commit(); @@ -254,7 +254,7 @@ public final class TransactionUtil imple clearTransactionBeginStack(); clearSetRollbackOnlyCause(); - Debug.logVerbose("Transaction committed", module); + if (Debug.verboseOn()) Debug.logVerbose("Transaction committed", module); } else { Debug.logWarning("Not committing transaction, status is " + getStatusString(), module); } @@ -315,7 +315,7 @@ public final class TransactionUtil imple if (ut != null) { try { int status = ut.getStatus(); - Debug.logVerbose("Current status : " + getTransactionStateString(status), module); + if (Debug.verboseOn()) Debug.logVerbose("Current status : " + getTransactionStateString(status), module); if (status != STATUS_NO_TRANSACTION) { //if (Debug.infoOn()) Thread.dumpStack(); @@ -353,7 +353,7 @@ public final class TransactionUtil imple if (ut != null) { try { int status = ut.getStatus(); - Debug.logVerbose("Current code : " + getTransactionStateString(status), module); + if (Debug.verboseOn()) Debug.logVerbose("Current code : " + getTransactionStateString(status), module); if (status != STATUS_NO_TRANSACTION) { if (status != STATUS_MARKED_ROLLBACK) { Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataAssert.java Wed Dec 13 12:43:05 2017 @@ -49,7 +49,7 @@ public class EntityDataAssert { return 0; } - Debug.logVerbose("Loading XML Resource: " + dataUrl.toExternalForm(), module); + if (Debug.verboseOn()) Debug.logVerbose("Loading XML Resource: " + dataUrl.toExternalForm(), module); try { for (GenericValue checkValue: delegator.readXmlDocument(dataUrl)) { Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityDataLoader.java Wed Dec 13 12:43:05 2017 @@ -247,7 +247,7 @@ public class EntityDataLoader { return 0; } - Debug.logVerbose("[loadData] Loading XML Resource: \"" + dataUrl.toExternalForm() + "\"", module); + if (Debug.verboseOn()) Debug.logVerbose("[loadData] Loading XML Resource: \"" + dataUrl.toExternalForm() + "\"", module); try { /* The OLD way Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntitySaxReader.java Wed Dec 13 12:43:05 2017 @@ -251,7 +251,7 @@ public class EntitySaxReader extends Def } Debug.logImportant("Finished " + numberRead + " values from " + docDescription, module); if (Debug.verboseOn()) { - Debug.logVerbose(" Detail created : " + numberCreated + ", skipped : " + numberSkipped + + if (Debug.verboseOn()) Debug.logVerbose(" Detail created : " + numberCreated + ", skipped : " + numberSkipped + ", updated : " + numberUpdated + ", replaced : " + numberReplaced + ", deleted : " + numberDeleted, module); } 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -83,8 +83,8 @@ public final class EntityEcaRule impleme actionsAndSets.trimToSize(); this.actionsAndSets = Collections.unmodifiableList(actionsAndSets); if (Debug.verboseOn()) { - Debug.logVerbose("Conditions: " + conditions, module); - Debug.logVerbose("actions and sets (intermixed): " + actionsAndSets, module); + if (Debug.verboseOn()) 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/SimpleMethod.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java Wed Dec 13 12:43:05 2017 @@ -543,10 +543,10 @@ public final class SimpleMethod extends if (UtilValidate.isEmpty(response)) { if (forceError) { // override response code, always use error code - Debug.logVerbose("No response code string found, but error messages found so assuming error; returning code [" + defaultErrorCode + "]", module); + if (Debug.verboseOn()) Debug.logVerbose("No response code string found, but error messages found so assuming error; returning code [" + defaultErrorCode + "]", module); response = defaultErrorCode; } else { - Debug.logVerbose("No response code string or errors found, assuming success; returning code [" + defaultSuccessCode + "]", module); + if (Debug.verboseOn()) Debug.logVerbose("No response code string or errors found, assuming success; returning code [" + defaultSuccessCode + "]", module); response = defaultSuccessCode; } } Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/callops/CallSimpleMethod.java Wed Dec 13 12:43:05 2017 @@ -111,7 +111,7 @@ public final class CallSimpleMethod exte } String returnVal = simpleMethodToCall.exec(localContext); if (Debug.verboseOn()) - Debug.logVerbose("Called simple-method named [" + this.methodName + "] in resource [" + this.xmlResource + "], returnVal is [" + returnVal + "]", module); + if (Debug.verboseOn()) Debug.logVerbose("Called simple-method named [" + this.methodName + "] in resource [" + this.xmlResource + "], returnVal is [" + returnVal + "]", module); if (simpleMethodToCall.getDefaultErrorCode().equals(returnVal)) { if (methodContext.getMethodType() == MethodContext.EVENT) { methodContext.putEnv(simpleMethod.getEventResponseCodeName(), simpleMethod.getDefaultErrorCode()); 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=1818005&r1=1818004&r2=1818005&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 12:43:05 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()) { - Debug.logVerbose("The from map in set-service-field was not found with name: " + mapFma, module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -69,7 +69,7 @@ public final class Iterate extends Metho public boolean exec(MethodContext methodContext) throws MiniLangException { if (listFma.isEmpty()) { if (Debug.verboseOn()) - Debug.logVerbose("Collection not found, doing nothing: " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Collection not found, doing nothing: " + this, module); return true; } Object oldEntryValue = entryFma.get(methodContext.getEnvMap()); @@ -102,7 +102,7 @@ public final class Iterate extends Metho Collection<Object> theCollection = UtilGenerics.checkCollection(objList); if (theCollection.size() == 0) { if (Debug.verboseOn()) - Debug.logVerbose("Collection has zero entries, doing nothing: " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Collection has zero entries, doing nothing: " + this, module); return true; } for (Object theEntry : theCollection) { @@ -127,7 +127,7 @@ public final class Iterate extends Metho Iterator<Object> theIterator = UtilGenerics.cast(objList); if (!theIterator.hasNext()) { if (Debug.verboseOn()) - Debug.logVerbose("Iterator has zero entries, doing nothing: " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Iterator has zero entries, doing nothing: " + this, module); return true; } while (theIterator.hasNext()) { @@ -151,7 +151,7 @@ public final class Iterate extends Metho } } else { if (Debug.verboseOn()) { - Debug.logVerbose("Cannot iterate over a " + objList == null ? "null object" : objList.getClass().getName() + if (Debug.verboseOn()) 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/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/IterateMap.java Wed Dec 13 12:43:05 2017 @@ -71,21 +71,21 @@ public final class IterateMap extends Me Object oldValue = valueFma.get(methodContext.getEnvMap()); if (oldKey != null) { if (Debug.verboseOn()) - Debug.logVerbose("In iterate-map the key had a non-null value before entering the loop for the operation: " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("In iterate-map the key had a non-null value before entering the loop for the operation: " + this, module); } if (oldValue != null) { if (Debug.verboseOn()) - Debug.logVerbose("In iterate-map the value had a non-null value before entering the loop for the operation: " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("In iterate-map the value had a non-null value before entering the loop for the operation: " + this, module); } Map<? extends Object, ? extends Object> theMap = mapFma.get(methodContext.getEnvMap()); if (theMap == null) { if (Debug.verboseOn()) - Debug.logVerbose("Map not found with name " + mapFma + ", doing nothing: " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Map not found with name " + mapFma + ", doing nothing: " + this, module); return true; } if (theMap.size() == 0) { if (Debug.verboseOn()) - Debug.logVerbose("Map with name " + mapFma + " has zero entries, doing nothing: " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Map with name " + mapFma + " has zero entries, doing nothing: " + this, module); return true; } for (Map.Entry<? extends Object, ? extends Object> theEntry : theMap.entrySet()) { Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/SetOperation.java Wed Dec 13 12:43:05 2017 @@ -145,7 +145,7 @@ public final class SetOperation extends } else if (!this.fromFma.isEmpty()) { newValue = this.fromFma.get(methodContext.getEnvMap()); if (Debug.verboseOn()) - Debug.logVerbose("In screen getting value for field from [" + this.fromFma.toString() + "]: " + newValue, module); + if (Debug.verboseOn()) Debug.logVerbose("In screen getting value for field from [" + this.fromFma.toString() + "]: " + newValue, module); } else if (!this.valueFse.isEmpty()) { newValue = this.valueFse.expand(methodContext.getEnvMap()); isConstant = true; @@ -157,12 +157,12 @@ public final class SetOperation extends } if (!setIfNull && newValue == null && !"NewMap".equals(this.type) && !"NewList".equals(this.type)) { if (Debug.verboseOn()) - Debug.logVerbose("Field value not found (null) with name [" + fromFma + "] and value [" + valueFse + "], and there was not default value, not setting field", module); + if (Debug.verboseOn()) Debug.logVerbose("Field value not found (null) with name [" + fromFma + "] and value [" + valueFse + "], and there was not default value, not setting field", module); return true; } if (!setIfEmpty && ObjectType.isEmpty(newValue)) { if (Debug.verboseOn()) - Debug.logVerbose("Field value not found (empty) with name [" + fromFma + "] and value [" + valueFse + "], and there was not default value, not setting field", module); + if (Debug.verboseOn()) Debug.logVerbose("Field value not found (empty) with name [" + fromFma + "] and value [" + valueFse + "], and there was not default value, not setting field", module); return true; } if (this.type.length() > 0) { @@ -195,7 +195,7 @@ public final class SetOperation extends } } if (Debug.verboseOn()) - Debug.logVerbose("Setting field [" + this.fieldFma.toString() + "] to value: " + newValue, module); + if (Debug.verboseOn()) Debug.logVerbose("Setting field [" + this.fieldFma.toString() + "] to value: " + newValue, module); this.fieldFma.put(methodContext.getEnvMap(), newValue); 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -75,7 +75,7 @@ public final class SecurityFactory { security.setDelegator(delegator); security = authorizationCache.putIfAbsentAndGet(delegator.getDelegatorName(), security); if (Debug.verboseOn()) { - Debug.logVerbose("Security implementation " + security.getClass().getName() + " created for delegator " + delegator.getDelegatorName(), module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -71,13 +71,13 @@ public abstract class GenericAbstractDis getJobManager().schedule(jobName, poolName, serviceName, context, startTime, frequency, interval, count, endTime, maxRetry); if (Debug.verboseOn()) { - Debug.logVerbose("[LocalDispatcher.schedule] : Current time : " + (new Date()).getTime(), module); - Debug.logVerbose("[LocalDispatcher.schedule] : Runtime : " + startTime, module); - Debug.logVerbose("[LocalDispatcher.schedule] : Frequency : " + frequency, module); - Debug.logVerbose("[LocalDispatcher.schedule] : Interval : " + interval, module); - Debug.logVerbose("[LocalDispatcher.schedule] : Count : " + count, module); - Debug.logVerbose("[LocalDispatcher.schedule] : EndTime : " + endTime, module); - Debug.logVerbose("[LocalDispatcher.schedule] : MazRetry : " + maxRetry, module); + if (Debug.verboseOn()) 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); + if (Debug.verboseOn()) Debug.logVerbose("[LocalDispatcher.schedule] : Count : " + count, module); + if (Debug.verboseOn()) Debug.logVerbose("[LocalDispatcher.schedule] : EndTime : " + endTime, module); + if (Debug.verboseOn()) Debug.logVerbose("[LocalDispatcher.schedule] : MazRetry : " + maxRetry, module); } } catch (JobManagerException jme) { Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericDispatcherFactory.java Wed Dec 13 12:43:05 2017 @@ -64,7 +64,7 @@ public class GenericDispatcherFactory im DispatchContext ctx = new DispatchContext(name, loader, this); this.dispatcher.register(ctx); this.ctx = ctx; - Debug.logVerbose("[GenericDispatcher] : Created Dispatcher for: " + name, module); + if (Debug.verboseOn()) Debug.logVerbose("[GenericDispatcher] : Created Dispatcher for: " + name, module); } @Override Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java Wed Dec 13 12:43:05 2017 @@ -50,7 +50,7 @@ public class GenericResultWaiter impleme completed = true; status = SERVICE_FINISHED; notify(); - Debug.logVerbose("Received Result (" + completed + ") -- " + result, module); + if (Debug.verboseOn()) Debug.logVerbose("Received Result (" + completed + ") -- " + result, module); } /** @@ -115,11 +115,11 @@ public class GenericResultWaiter impleme * @return Map */ public synchronized Map<String, Object> waitForResult(long milliseconds) { - Debug.logVerbose("Waiting for results...", module); + if (Debug.verboseOn()) Debug.logVerbose("Waiting for results...", module); while (!isCompleted()) { try { this.wait(milliseconds); - Debug.logVerbose("Waiting...", module); + if (Debug.verboseOn()) Debug.logVerbose("Waiting...", module); } catch (java.lang.InterruptedException e) { Debug.logError(e, module); } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelParam.java Wed Dec 13 12:43:05 2017 @@ -199,7 +199,7 @@ public class ModelParam implements Seria if (this.defaultValue != null) { this.optional = true; } - Debug.logVerbose("Default value for attribute [" + this.name + "] set to [" + this.defaultValue + "]", module); + if (Debug.verboseOn()) Debug.logVerbose("Default value for attribute [" + this.name + "] set to [" + this.defaultValue + "]", module); } public void copyDefaultValue(ModelParam param) { this.setDefaultValue(param.defaultValue); Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java Wed Dec 13 12:43:05 2017 @@ -517,12 +517,12 @@ public class ModelService extends Abstra Map<String, String> requiredInfo = new HashMap<>(); Map<String, String> optionalInfo = new HashMap<>(); - Debug.logVerbose("[ModelService.validate] : {" + this.name + "} : Validating context - " + context, module); + if (Debug.verboseOn()) Debug.logVerbose("[ModelService.validate] : {" + this.name + "} : Validating context - " + context, module); // do not validate results with errors if (mode.equals(OUT_PARAM) && context != null && context.containsKey(RESPONSE_MESSAGE)) { if (RESPOND_ERROR.equals(context.get(RESPONSE_MESSAGE)) || RESPOND_FAIL.equals(context.get(RESPONSE_MESSAGE))) { - Debug.logVerbose("[ModelService.validate] : {" + this.name + "} : response was an error, not validating.", module); + if (Debug.verboseOn()) Debug.logVerbose("[ModelService.validate] : {" + this.name + "} : response was an error, not validating.", module); return; } } @@ -584,11 +584,11 @@ public class ModelService extends Abstra } requiredNames.append(key); } - Debug.logVerbose("[ModelService.validate] : required fields - " + requiredNames, module); + if (Debug.verboseOn()) Debug.logVerbose("[ModelService.validate] : required fields - " + requiredNames, module); - Debug.logVerbose("[ModelService.validate] : {" + name + "} : (" + mode + ") Required - " + + if (Debug.verboseOn()) Debug.logVerbose("[ModelService.validate] : {" + name + "} : (" + mode + ") Required - " + requiredTest.size() + " / " + requiredInfo.size(), module); - Debug.logVerbose("[ModelService.validate] : {" + name + "} : (" + mode + ") Optional - " + + if (Debug.verboseOn()) Debug.logVerbose("[ModelService.validate] : {" + name + "} : (" + mode + ") Optional - " + optionalTest.size() + " / " + optionalInfo.size(), module); } @@ -1138,7 +1138,7 @@ public class ModelService extends Abstra if (group != null) { for (GroupServiceModel sm: group.getServices()) { implServices.add(new ModelServiceIface(sm.getName(), sm.isOptional())); - Debug.logVerbose("Adding service [" + sm.getName() + "] as interface of: [" + this.name + "]", module); + if (Debug.verboseOn()) Debug.logVerbose("Adding service [" + sm.getName() + "] as interface of: [" + this.name + "]", module); } } } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelServiceReader.java Wed Dec 13 12:43:05 2017 @@ -369,7 +369,7 @@ public class ModelServiceReader implemen groupElement.setAttribute("name", "_" + service.name + ".group"); service.internalGroup = new GroupModel(groupElement); service.invoke = service.internalGroup.getGroupName(); - Debug.logVerbose("Created INTERNAL GROUP model [" + service.internalGroup + "]", module); + if (Debug.verboseOn()) Debug.logVerbose("Created INTERNAL GROUP model [" + service.internalGroup + "]", module); } } @@ -483,7 +483,7 @@ public class ModelServiceReader implemen // default value String defValue = attribute.getAttribute("default-value"); if (UtilValidate.isNotEmpty(defValue)) { - Debug.logVerbose("Got a default-value [" + defValue + "] for service attribute [" + service.name + "." + param.name + "]", module); + if (Debug.verboseOn()) Debug.logVerbose("Got a default-value [" + defValue + "] for service attribute [" + service.name + "." + param.name + "]", module); param.setDefaultValue(defValue.intern()); } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java Wed Dec 13 12:43:05 2017 @@ -162,7 +162,7 @@ public class ServiceDispatcher { String dispatcherKey = delegator != null ? delegator.getDelegatorName() : "null"; sd = dispatchers.get(dispatcherKey); if (sd == null) { - Debug.logVerbose("[ServiceDispatcher.getInstance] : No instance found (" + dispatcherKey + ").", module); + if (Debug.verboseOn()) Debug.logVerbose("[ServiceDispatcher.getInstance] : No instance found (" + dispatcherKey + ").", module); sd = new ServiceDispatcher(delegator); ServiceDispatcher cachedDispatcher = dispatchers.putIfAbsent(dispatcherKey, sd); if (cachedDispatcher == null) { @@ -273,7 +273,7 @@ public class ServiceDispatcher { } if (Debug.verboseOn() || modelService.debug) { - Debug.logVerbose("[ServiceDispatcher.runSync] : invoking service " + modelService.name + " [" + modelService.location + + if (Debug.verboseOn()) Debug.logVerbose("[ServiceDispatcher.runSync] : invoking service " + modelService.name + " [" + modelService.location + "/" + modelService.invoke + "] (" + modelService.engineName + ")", module); } @@ -611,7 +611,7 @@ public class ServiceDispatcher { if (resultStr.length() > 10240) { resultStr = resultStr.substring(0, 10226) + "...[truncated]"; } - Debug.logVerbose("Sync service [" + localName + "/" + modelService.name + "] finished with response [" + resultStr + "]", module); + if (Debug.verboseOn()) Debug.logVerbose("Sync service [" + localName + "/" + modelService.name + "] finished with response [" + resultStr + "]", module); } if (modelService.metrics != null) { modelService.metrics.recordServiceRate(1, timeToRun); @@ -635,7 +635,7 @@ public class ServiceDispatcher { UtilTimer.timerLog(localName + " / " + service.name, "ASync service started...", module); } if (Debug.verboseOn() || service.debug) { - Debug.logVerbose("[ServiceDispatcher.runAsync] : preparing service " + service.name + " [" + service.location + "/" + service.invoke + + if (Debug.verboseOn()) Debug.logVerbose("[ServiceDispatcher.runAsync] : preparing service " + service.name + " [" + service.location + "/" + service.invoke + "] (" + service.engineName + ")", module); } @@ -962,7 +962,7 @@ public class ServiceDispatcher { private GenericValue getLoginObject(String service, String localName, String username, String password, Locale locale) throws GenericServiceException { Map<String, Object> context = UtilMisc.toMap("login.username", username, "login.password", password, "isServiceAuth", true, "locale", locale); - Debug.logVerbose("[ServiceDispathcer.authenticate] : Invoking UserLogin Service", module); + if (Debug.verboseOn()) Debug.logVerbose("[ServiceDispathcer.authenticate] : Invoking UserLogin Service", module); // get the dispatch context and service model DispatchContext dctx = getLocalContext(localName); Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceXaWrapper.java Wed Dec 13 12:43:05 2017 @@ -161,7 +161,7 @@ public class ServiceXaWrapper extends Ge @Override public void enlist() throws XAException { super.enlist(); - Debug.logVerbose("Enlisted in transaction : " + this.toString(), module); + if (Debug.verboseOn()) Debug.logVerbose("Enlisted in transaction : " + this.toString(), module); } // -- XAResource Methods @@ -170,7 +170,7 @@ public class ServiceXaWrapper extends Ge */ @Override public void commit(Xid xid, boolean onePhase) throws XAException { - Debug.logVerbose("ServiceXaWrapper#commit() : " + onePhase + " / " + xid.toString(), module); + if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#commit() : " + onePhase + " / " + xid.toString(), module); // the commit listener if (this.active) { Debug.logWarning("commit() called without end()", module); @@ -205,7 +205,7 @@ public class ServiceXaWrapper extends Ge */ @Override public void rollback(Xid xid) throws XAException { - Debug.logVerbose("ServiceXaWrapper#rollback() : " + xid.toString(), module); + if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#rollback() : " + xid.toString(), module); // the rollback listener if (this.active) { Debug.logWarning("rollback() called without end()", module); @@ -238,7 +238,7 @@ public class ServiceXaWrapper extends Ge @Override public int prepare(Xid xid) throws XAException { // overriding to log two phase commits - Debug.logVerbose("ServiceXaWrapper#prepare() : " + xid.toString(), module); + if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#prepare() : " + xid.toString(), module); int rtn; try { rtn = super.prepare(xid); @@ -246,7 +246,7 @@ public class ServiceXaWrapper extends Ge Debug.logError(e, module); throw e; } - Debug.logVerbose("ServiceXaWrapper#prepare() : " + rtn + " / " + (rtn == XA_OK) , module); + if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#prepare() : " + rtn + " / " + (rtn == XA_OK) , module); return rtn; } @@ -349,7 +349,7 @@ public class ServiceXaWrapper extends Ge } } } else { - Debug.logVerbose("No " + msgPrefix + "service defined; nothing to do", module); + if (Debug.verboseOn()) Debug.logVerbose("No " + msgPrefix + "service defined; nothing to do", module); } this.xid = null; 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -205,8 +205,8 @@ public class RecurrenceInfo { } if (Debug.verboseOn()) { - Debug.logVerbose("Date List Size: " + (rDateList == null ? 0 : rDateList.size()), module); - Debug.logVerbose("Rule List Size: " + (rRulesList == null ? 0 : rRulesList.size()), module); + if (Debug.verboseOn()) 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); } // Check the rules and date list Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/RecurrenceRule.java Wed Dec 13 12:43:05 2017 @@ -163,21 +163,21 @@ public class RecurrenceRule { */ public long getEndTime() { if (rule == null) { - Debug.logVerbose("Rule is null.", module); + if (Debug.verboseOn()) Debug.logVerbose("Rule is null.", module); return -1; } long time = 0; java.sql.Timestamp stamp = null; stamp = rule.getTimestamp("untilDateTime"); - Debug.logVerbose("Stamp value: " + stamp, module); + if (Debug.verboseOn()) Debug.logVerbose("Stamp value: " + stamp, module); if (stamp != null) { long nanos = stamp.getNanos(); time = stamp.getTime(); time += (nanos / 1000000); } - Debug.logVerbose("Returning time: " + time, module); + if (Debug.verboseOn()) Debug.logVerbose("Returning time: " + time, module); return time; } @@ -261,12 +261,12 @@ public class RecurrenceRule { // Test the end time of the recurrence. if (getEndTime() != 0 && getEndTime() <= RecurrenceUtil.now()) return 0; - Debug.logVerbose("Rule NOT expired by end time.", module); + if (Debug.verboseOn()) Debug.logVerbose("Rule NOT expired by end time.", module); // Test the recurrence limit. if (getCount() != -1 && currentCount >= getCount()) return 0; - Debug.logVerbose("Rule NOT expired by max count.", module); + if (Debug.verboseOn()) Debug.logVerbose("Rule NOT expired by max count.", module); boolean isSeeking = true; long nextRuntime = 0; 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=1818005&r1=1818004&r2=1818005&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 12:43:05 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()) { - Debug.logVerbose("Created " + this, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Created " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); } } @@ -313,7 +313,7 @@ public class TemporalExpressions impleme this.start = start; this.end = end; if (Debug.verboseOn()) { - Debug.logVerbose("Created " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); } } @@ -433,7 +433,7 @@ public class TemporalExpressions impleme this.start = start; this.end = end; if (Debug.verboseOn()) { - Debug.logVerbose("Created " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); } } @@ -565,7 +565,7 @@ public class TemporalExpressions impleme } this.sequence = included.sequence; if (Debug.verboseOn()) { - Debug.logVerbose("Created " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); } } @@ -685,7 +685,7 @@ public class TemporalExpressions impleme this.freqType = freqType; this.freqCount = freqCount; if (Debug.verboseOn()) { - Debug.logVerbose("Created " + this, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Created " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); } } @@ -997,7 +997,7 @@ public class TemporalExpressions impleme this.sequence = result; } if (Debug.verboseOn()) { - Debug.logVerbose("Created " + this, module); + if (Debug.verboseOn()) 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()) { - Debug.logVerbose("Created " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); } } @@ -1280,7 +1280,7 @@ public class TemporalExpressions impleme this.start = start; this.end = end; if (Debug.verboseOn()) { - Debug.logVerbose("Created " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); } } @@ -1437,7 +1437,7 @@ public class TemporalExpressions impleme } this.sequence = included.sequence; if (Debug.verboseOn()) { - Debug.logVerbose("Created " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Created " + this, module); } } @@ -1555,7 +1555,7 @@ public class TemporalExpressions impleme this.sequence = that.sequence; } if (Debug.verboseOn()) { - Debug.logVerbose("Created " + this, module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -70,7 +70,7 @@ public final class ServiceEcaRule implem } if (Debug.verboseOn()) { - Debug.logVerbose("Conditions: " + conditions, module); + if (Debug.verboseOn()) Debug.logVerbose("Conditions: " + conditions, module); } Set<String> nameSet = UtilMisc.toSet("set", "action"); @@ -83,7 +83,7 @@ public final class ServiceEcaRule implem } if (Debug.verboseOn()) { - Debug.logVerbose("actions and sets (intermixed): " + actionsAndSets, module); + if (Debug.verboseOn()) Debug.logVerbose("actions and sets (intermixed): " + actionsAndSets, module); } } @@ -141,7 +141,7 @@ public final class ServiceEcaRule implem break; } else { if (Debug.verboseOn()) { - Debug.logVerbose("For Service ECA [" + this.serviceName + "] on [" + this.eventName + "] got true for condition: " + ec, module); + if (Debug.verboseOn()) 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=1818005&r1=1818004&r2=1818005&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 12:43:05 2017 @@ -120,9 +120,9 @@ public class XMLRPCClientEngine extends List<ModelParam> inModelParamList = modelService.getInModelParamList(); if (Debug.verboseOn()) { - Debug.logVerbose("[XMLRPCClientEngine.invoke] : Parameter length - " + inModelParamList.size(), module); + if (Debug.verboseOn()) Debug.logVerbose("[XMLRPCClientEngine.invoke] : Parameter length - " + inModelParamList.size(), module); for (ModelParam p: inModelParamList) { - Debug.logVerbose("[XMLRPCClientEngine.invoke} : Parameter: " + p.name + " (" + p.mode + ")", module); + 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/group/GroupModel.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java?rev=1818005&r1=1818004&r2=1818005&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/group/GroupModel.java Wed Dec 13 12:43:05 2017 @@ -71,7 +71,7 @@ public class GroupModel { } if (Debug.verboseOn()) - Debug.logVerbose("Created Service Group Model --> " + this, module); + if (Debug.verboseOn()) Debug.logVerbose("Created Service Group Model --> " + this, module); } /** @@ -161,10 +161,10 @@ public class GroupModel { Map<String, Object> result = new HashMap<String, Object>(); for (GroupServiceModel model : services) { if (Debug.verboseOn()) - Debug.logVerbose("Using Context: " + runContext, module); + if (Debug.verboseOn()) Debug.logVerbose("Using Context: " + runContext, module); Map<String, Object> thisResult = model.invoke(dispatcher, localName, runContext); if (Debug.verboseOn()) - Debug.logVerbose("Result: " + thisResult, module); + if (Debug.verboseOn()) Debug.logVerbose("Result: " + thisResult, module); // make sure we didn't fail if (ServiceUtil.isError(thisResult)) { @@ -175,7 +175,7 @@ public class GroupModel { result.putAll(thisResult); if (model.resultToContext()) { runContext.putAll(thisResult); - Debug.logVerbose("Added result(s) to context.", module); + if (Debug.verboseOn()) Debug.logVerbose("Added result(s) to context.", module); } } return result; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |