From 1dc7cd563c8ec5c63308c6269ef0f55b6227bbf5 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 4 Feb 2010 18:40:39 +0000 Subject: [PATCH] fixed lookup log message (SPR-6746) git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2928 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../core/convert/support/GenericConversionService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java b/org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java index 4c26a26841a..b025bee8027 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java +++ b/org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -450,19 +450,19 @@ public class GenericConversionService implements ConversionService, ConverterReg for (ConditionalGenericConverter conditional : this.conditionalConverters) { if (conditional.matches(sourceType, targetType)) { if (logger.isDebugEnabled()) { - logger.debug("Converter lookup [MATCHED] " + conditional); + logger.debug("Conditional converter lookup [MATCHED] " + conditional); } return conditional; } else { if (logger.isDebugEnabled()) { - logger.debug("Converter lookup [DID NOT MATCH] " + conditional); + logger.debug("Conditional converter lookup [DID NOT MATCH] " + conditional); } } } } - if (logger.isDebugEnabled()) { - logger.debug("Converter lookup [MATCHED] " + this.defaultConverter); + if (this.defaultConverter != null && logger.isDebugEnabled()) { + logger.debug("Default converter lookup [MATCHED] " + this.defaultConverter); } return this.defaultConverter; }