Author: bpoussin Date: 2012-08-20 23:01:48 +0200 (Mon, 20 Aug 2012) New Revision: 242 Url: http://chorem.org/repositories/revision/chorem/242 Log: conversion d'une chaine vide en null pour une date Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2012-08-20 20:35:04 UTC (rev 241) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2012-08-20 21:01:48 UTC (rev 242) @@ -89,11 +89,11 @@ Object result = null; if (value != null) { if (String.class.isAssignableFrom(type)) { - if (StringUtils.isNotBlank((String)value)) { result = WikittyUtil.toString(value); + } else if (Date.class.isAssignableFrom(type)) { + if (!(value instanceof String) || StringUtils.isNotBlank((String)value)) { + result = WikittyUtil.toDate(value); } - } else if (Date.class.isAssignableFrom(type)) { - result = WikittyUtil.toDate(value); } else { throw new ConversionException(String.format( "Chorem date converter can't convert '%s' to '%s'",