From 468655a17c1d005420840fdf0d2fc163fecda465 Mon Sep 17 00:00:00 2001 From: Andrei Ivanov Date: Tue, 11 Oct 2016 12:07:25 +0200 Subject: [PATCH] Use placeholders instead of string concatenation when logging --- .../pool/validation/DefaultDirContextValidator.java | 12 +++--------- .../pool2/validation/DefaultDirContextValidator.java | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java b/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java index 644cba66..bdb4b95f 100644 --- a/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java +++ b/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java @@ -170,23 +170,17 @@ public class DefaultDirContextValidator implements DirContextValidator { final NamingEnumeration searchResults = dirContext.search(this.base, this.filter, this.searchControls); if (searchResults.hasMore()) { - if (this.logger.isDebugEnabled()) { - this.logger.debug("DirContext '" + dirContext + "' passed validation."); - } + this.logger.debug("DirContext '{}' passed validation.", dirContext); return true; } } catch (Exception e) { - if(this.logger.isDebugEnabled()) { - this.logger.debug("DirContext '" + dirContext + "' failed validation with an exception.", e); - } + this.logger.debug("DirContext '{}' failed validation with an exception.", dirContext, e); return false; } - if (this.logger.isDebugEnabled()) { - this.logger.debug("DirContext '" + dirContext + "' failed validation."); - } + this.logger.debug("DirContext '{}' failed validation.", dirContext); return false; } } diff --git a/core/src/main/java/org/springframework/ldap/pool2/validation/DefaultDirContextValidator.java b/core/src/main/java/org/springframework/ldap/pool2/validation/DefaultDirContextValidator.java index ebccf61b..7845672f 100644 --- a/core/src/main/java/org/springframework/ldap/pool2/validation/DefaultDirContextValidator.java +++ b/core/src/main/java/org/springframework/ldap/pool2/validation/DefaultDirContextValidator.java @@ -170,23 +170,17 @@ public class DefaultDirContextValidator implements DirContextValidator { final NamingEnumeration searchResults = dirContext.search(this.base, this.filter, this.searchControls); if (searchResults.hasMore()) { - if (this.logger.isDebugEnabled()) { - this.logger.debug("DirContext '" + dirContext + "' passed validation."); - } + this.logger.debug("DirContext '{}' passed validation.", dirContext); return true; } } catch (Exception e) { - if(this.logger.isDebugEnabled()) { - this.logger.debug("DirContext '" + dirContext + "' failed validation with an exception.", e); - } + this.logger.debug("DirContext '{}' failed validation with an exception.", dirContext, e); return false; } - if (this.logger.isDebugEnabled()) { - this.logger.debug("DirContext '" + dirContext + "' failed validation."); - } + this.logger.debug("DirContext '{}' failed validation.", dirContext); return false; } }