Author: cbrisson
Date: Thu Jan 26 02:09:39 2017
New Revision: 1780311
URL: http://svn.apache.org/viewvc?rev=1780311&view=rev
Log:
[engine] remove useless isXXXEnabled() tests
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/Template.java
Thu Jan 26 02:09:39 2017
@@ -368,10 +368,7 @@ public class Template extends Resource
else
{
Logger renderingLog = rsvc.getLog("rendering");
- if (renderingLog.isDebugEnabled())
- {
- renderingLog.debug(stop.getMessage());
- }
+ renderingLog.debug(stop.getMessage());
}
}
catch (IOException e)
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/ParserPoolImpl.java
Thu Jan 26 02:09:39 2017
@@ -53,10 +53,7 @@ public class ParserPoolImpl implements P
pool.put(rsvc.createNewParser());
}
- if (log.isDebugEnabled())
- {
- log.debug("Created '{}' parsers.", max);
- }
+ log.debug("Created '{}' parsers.", max);
}
/**
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
Thu Jan 26 02:09:39 2017
@@ -459,10 +459,7 @@ public class RuntimeInstance implements
/* populate 'defaultEncoding' member */
defaultEncoding = getString(INPUT_ENCODING, ENCODING_DEFAULT);
- if (log.isDebugEnabled())
- {
- log.debug("Default Properties resource: {}",
DEFAULT_RUNTIME_PROPERTIES);
- }
+ log.debug("Default Properties resource: {}",
DEFAULT_RUNTIME_PROPERTIES);
}
catch (IOException ioe)
{
@@ -1028,10 +1025,7 @@ public class RuntimeInstance implements
for( int i = 0; i < userdirective.length; i++)
{
loadDirective(userdirective[i]);
- if (log.isDebugEnabled())
- {
- log.debug("Loaded User Directive: {}", userdirective[i]);
- }
+ log.debug("Loaded User Directive: {}", userdirective[i]);
}
}
@@ -1229,12 +1223,9 @@ public class RuntimeInstance implements
/*
* if we couldn't get a parser from the pool make one and log it.
*/
- if (log.isInfoEnabled())
- {
- log.info("Runtime : ran out of parsers. Creating a new one. "
- + " Please increment the parser.pool.size property."
- + " The current value is too small.");
- }
+ log.info("Runtime : ran out of parsers. Creating a new one. "
+ + " Please increment the parser.pool.size property."
+ + " The current value is too small.");
parser = createNewParser();
keepParser = false;
}
@@ -1416,7 +1407,7 @@ public class RuntimeInstance implements
{
throw stop;
}
- else if (log.isDebugEnabled())
+ else
{
log.debug(stop.getMessage());
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java
Thu Jan 26 02:09:39 2017
@@ -376,10 +376,7 @@ public class VelocimacroFactory
{
vmManager.addVM(name, macroBody, macroArgs, definingTemplate,
replaceAllowed);
}
- if (log.isDebugEnabled())
- {
- log.debug("added VM {}: source={}", name, definingTemplate);
- }
+ log.debug("added VM {}: source={}", name, definingTemplate);
return true;
}
@@ -437,8 +434,7 @@ public class VelocimacroFactory
* causes false alarms when several concurrent threads
simultaneously (re)parse
* some macro
*/
- if (log.isDebugEnabled())
- log.debug("VM addition rejected : {} : inline not allowed
to replace existing VM", name);
+ log.debug("VM addition rejected : {} : inline not allowed to
replace existing VM", name);
return false;
}
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java
Thu Jan 26 02:09:39 2017
@@ -149,7 +149,7 @@ public class Parse extends InputBase
* does it have a value? If you have a null reference, then no.
*/
Object value = node.jjtGetChild(0).value( context );
- if (value == null && log.isDebugEnabled())
+ if (value == null)
{
log.debug("#parse(): null argument at {}",
StringUtils.formatFileString(this));
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
Thu Jan 26 02:09:39 2017
@@ -512,7 +512,7 @@ public class ASTReference extends Simple
writer.write(morePrefix);
writer.write(localNullString);
- if (logOnNull && referenceType != QUIET_REFERENCE &&
log.isDebugEnabled())
+ if (logOnNull && referenceType != QUIET_REFERENCE)
{
log.debug("Null reference [template '{}', line {}, column {}]
: {} cannot be resolved.",
getTemplateName(), this.getLine(), this.getColumn(),
this.literal());
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
Thu Jan 26 02:09:39 2017
@@ -441,7 +441,7 @@ public class ResourceManagerImpl
* multi-path support - will revisit and fix
*/
- if (logWhenFound && log.isDebugEnabled())
+ if (logWhenFound)
{
log.debug("ResourceManager: found {} with loader {}",
resourceName, resourceLoader.getClassName());
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
Thu Jan 26 02:09:39 2017
@@ -85,10 +85,7 @@ public class ClasspathResourceLoader ext
*/
public void init( ExtProperties configuration)
{
- if (log.isTraceEnabled())
- {
- log.trace("ClasspathResourceLoader : initialization complete.");
- }
+ log.trace("ClasspathResourceLoader : initialization complete.");
}
/**
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
Thu Jan 26 02:09:39 2017
@@ -149,21 +149,15 @@ public class DataSourceResourceLoader ex
if (dataSource != null)
{
- if (log.isDebugEnabled())
- {
- log.debug("DataSourceResourceLoader: using dataSource instance
with table \"{}\"", tableName);
- log.debug("DataSourceResourceLoader: using columns \"{}\",
\"{}\" and \"{}\"", keyColumn, templateColumn, timestampColumn);
- }
+ log.debug("DataSourceResourceLoader: using dataSource instance
with table \"{}\"", tableName);
+ log.debug("DataSourceResourceLoader: using columns \"{}\", \"{}\"
and \"{}\"", keyColumn, templateColumn, timestampColumn);
log.trace("DataSourceResourceLoader initialized.");
}
else if (dataSourceName != null)
{
- if (log.isDebugEnabled())
- {
- log.debug("DataSourceResourceLoader: using \"{}\" datasource
with table \"{}\"", dataSourceName, tableName);
- log.debug("DataSourceResourceLoader: using columns \"{}\",
\"{}\" and \"{}\"", keyColumn, templateColumn, timestampColumn);
- }
+ log.debug("DataSourceResourceLoader: using \"{}\" datasource with
table \"{}\"", dataSourceName, tableName);
+ log.debug("DataSourceResourceLoader: using columns \"{}\", \"{}\"
and \"{}\"", keyColumn, templateColumn, timestampColumn);
log.trace("DataSourceResourceLoader initialized.");
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/FileResourceLoader.java
Thu Jan 26 02:09:39 2017
@@ -67,10 +67,7 @@ public class FileResourceLoader extends
*/
public void init( ExtProperties configuration)
{
- if (log.isTraceEnabled())
- {
- log.trace("FileResourceLoader : initialization starting.");
- }
+ log.trace("FileResourceLoader : initialization starting.");
paths.addAll( configuration.getVector("path") );
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarHolder.java
Thu Jan 26 02:09:39 2017
@@ -59,10 +59,7 @@ public class JarHolder
this.urlpath=urlpath;
init();
- if (log.isDebugEnabled())
- {
- log.debug("JarHolder: initialized JAR: {}", urlpath);
- }
+ log.debug("JarHolder: initialized JAR: {}", urlpath);
}
/**
@@ -72,10 +69,8 @@ public class JarHolder
{
try
{
- if (log.isDebugEnabled())
- {
- log.debug("JarHolder: attempting to connect to {}", urlpath);
- }
+ log.debug("JarHolder: attempting to connect to {}", urlpath);
+
URL url = new URL( urlpath );
conn = (JarURLConnection) url.openConnection();
conn.setAllowUserInteraction(false);
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/JarResourceLoader.java
Thu Jan 26 02:09:39 2017
@@ -109,10 +109,7 @@ public class JarResourceLoader extends R
private void loadJar( String path )
{
- if (log.isDebugEnabled())
- {
- log.debug("JarResourceLoader : trying to load \"{}\"", path);
- }
+ log.debug("JarResourceLoader : trying to load \"{}\"", path);
// Check path information
if ( path == null )
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ResourceLoader.java
Thu Jan 26 02:09:39 2017
@@ -246,11 +246,8 @@ public abstract class ResourceLoader
}
catch (ResourceNotFoundException e)
{
- if (log.isDebugEnabled())
- {
- log.debug("Could not load resource '{}' from ResourceLoader
{}",
- resourceName, this.getClass().getName());
- }
+ log.debug("Could not load resource '{}' from ResourceLoader {}",
+ resourceName, this.getClass().getName());
}
finally
{
@@ -263,14 +260,11 @@ public abstract class ResourceLoader
}
catch (Exception e)
{
- if (log.isErrorEnabled())
- {
- String msg = "While closing InputStream for resource '" +
- resourceName + "' from ResourceLoader " +
- this.getClass().getName();
- log.error(msg, e);
- throw new VelocityException(msg, e);
- }
+ String msg = "While closing InputStream for resource '" +
+ resourceName + "' from ResourceLoader " +
+ this.getClass().getName();
+ log.error(msg, e);
+ throw new VelocityException(msg, e);
}
}
return (reader != null);
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/StringResourceLoader.java
Thu Jan 26 02:09:39 2017
@@ -223,7 +223,7 @@ public class StringResourceLoader extend
if (isStatic)
{
this.repository = getRepository(repoName);
- if (repository != null && log.isDebugEnabled())
+ if (repository != null)
{
log.debug("Loaded repository '{}' from static repo store",
repoName);
}
@@ -231,7 +231,7 @@ public class StringResourceLoader extend
else
{
this.repository =
(StringResourceRepository)rsvc.getApplicationAttribute(repoName);
- if (repository != null && log.isDebugEnabled())
+ if (repository != null)
{
log.debug("Loaded repository '{}' from application
attributes", repoName);
}
@@ -267,11 +267,8 @@ public class StringResourceLoader extend
if (encoding != null &&
!this.repository.getEncoding().equals(encoding))
{
- if (log.isDebugEnabled())
- {
- log.debug("Changing the default encoding of string
repository '{}' from {} to {}",
- repoName, this.repository.getEncoding(),
encoding);
- }
+ log.debug("Changing the default encoding of string repository
'{}' from {} to {}",
+ repoName, this.repository.getEncoding(), encoding);
this.repository.setEncoding(encoding);
}
}
@@ -285,10 +282,7 @@ public class StringResourceLoader extend
public StringResourceRepository createRepository(final String className,
final String encoding)
{
- if (log.isDebugEnabled())
- {
- log.debug("Creating string repository using class {}...",
className);
- }
+ log.debug("Creating string repository using class {}...", className);
StringResourceRepository repo;
try
@@ -317,10 +311,7 @@ public class StringResourceLoader extend
repo.setEncoding(RuntimeConstants.ENCODING_DEFAULT);
}
- if (log.isDebugEnabled())
- {
- log.debug("Default repository encoding is {}", repo.getEncoding());
- }
+ log.debug("Default repository encoding is {}", repo.getEncoding());
return repo;
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/URLResourceLoader.java
Thu Jan 26 02:09:39 2017
@@ -122,7 +122,7 @@ public class URLResourceLoader extends R
if (reader != null)
{
- if (log.isDebugEnabled()) log.debug("URLResourceLoader:
Found '{}' at '{}'", name, roots[i]);
+ log.debug("URLResourceLoader: Found '{}' at '{}'", name,
roots[i]);
// save this root for later re-use
templateRoots.put(name, roots[i]);
@@ -139,7 +139,7 @@ public class URLResourceLoader extends R
}
catch (IOException e) {}
}
- if (log.isDebugEnabled()) log.debug("URLResourceLoader:
Exception when looking for '{}' at '{}'", name, roots[i], ioe);
+ log.debug("URLResourceLoader: Exception when looking for '{}'
at '{}'", name, roots[i], ioe);
// only save the first one for later throwing
if (exception == null)
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassFieldMap.java
Thu Jan 26 02:09:39 2017
@@ -67,7 +67,7 @@ public class ClassFieldMap
this.clazz = clazz;
this.log = log;
- if (debugReflection && log.isDebugEnabled())
+ if (debugReflection)
{
log.debug("=================================================================");
log.debug("== Class: {}", clazz);
@@ -75,7 +75,7 @@ public class ClassFieldMap
fieldCache = createFieldCache();
- if (debugReflection && log.isDebugEnabled())
+ if (debugReflection)
{
log.debug("=================================================================");
}
@@ -148,7 +148,7 @@ public class ClassFieldMap
private void populateFieldCacheWith(Map fieldCache, Class classToReflect)
{
- if (debugReflection && log.isDebugEnabled())
+ if (debugReflection)
{
log.debug("Reflecting {}", classToReflect);
}
@@ -167,10 +167,7 @@ public class ClassFieldMap
}
catch (SecurityException se) // Everybody feels better with...
{
- if (log.isDebugEnabled())
- {
- log.debug("While accessing fields of {}:", classToReflect, se);
- }
+ log.debug("While accessing fields of {}:", classToReflect, se);
}
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ClassMap.java
Thu Jan 26 02:09:39 2017
@@ -78,7 +78,7 @@ public class ClassMap
this.clazz = clazz;
this.log = log;
- if (debugReflection && log.isDebugEnabled())
+ if (debugReflection)
{
log.debug("=================================================================");
log.debug("== Class: {}", clazz);
@@ -86,7 +86,7 @@ public class ClassMap
methodCache = createMethodCache(conversionHandler);
- if (debugReflection && log.isDebugEnabled())
+ if (debugReflection)
{
log.debug("=================================================================");
}
@@ -170,7 +170,7 @@ public class ClassMap
private void populateMethodCacheWith(MethodCache methodCache, Class
classToReflect)
{
- if (debugReflection && log.isDebugEnabled())
+ if (debugReflection)
{
log.debug("Reflecting {}", classToReflect);
}
@@ -189,10 +189,7 @@ public class ClassMap
}
catch (SecurityException se) // Everybody feels better with...
{
- if (log.isDebugEnabled())
- {
- log.debug("While accessing methods of {}:", classToReflect,
se);
- }
+ log.debug("While accessing methods of {}:", classToReflect, se);
}
}
@@ -304,7 +301,7 @@ public class ClassMap
{
cache.put(methodKey, method);
methodMap.add(method);
- if (debugReflection && log.isDebugEnabled())
+ if (debugReflection)
{
log.debug("Adding {}", method);
}
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java?rev=1780311&r1=1780310&r2=1780311&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/UberspectImpl.java
Thu Jan 26 02:09:39 2017
@@ -181,24 +181,18 @@ public class UberspectImpl implements Ub
}
else if (obj instanceof Iterator)
{
- if (log.isDebugEnabled())
- {
- log.debug("The iterative object in the #foreach() loop at {}" +
- " is of type java.util.Iterator. Because " +
- "it is not resettable, if used in more than once it
" +
- "may lead to unexpected results.", i);
- }
+ log.debug("The iterative object in the #foreach() loop at {}" +
+ " is of type java.util.Iterator. Because " +
+ "it is not resettable, if used in more than once it " +
+ "may lead to unexpected results.", i);
return ((Iterator) obj);
}
else if (obj instanceof Enumeration)
{
- if (log.isDebugEnabled())
- {
- log.debug("The iterative object in the #foreach() loop at {}" +
- " is of type java.util.Enumeration. Because " +
- "it is not resettable, if used in more than once it
" +
- "may lead to unexpected results.", i);
- }
+ log.debug("The iterative object in the #foreach() loop at {}" +
+ " is of type java.util.Enumeration. Because " +
+ "it is not resettable, if used in more than once it " +
+ "may lead to unexpected results.", i);
return new EnumerationIterator((Enumeration) obj);
}
else
