From b1d017ee6f8d4d2e8f31dfaf0784de5fb4e49f2c Mon Sep 17 00:00:00 2001
From: Dancovich <danilo.viana@serpro.gov.br>
Date: Thu, 12 Sep 2013 14:39:13 -0300
Subject: [PATCH] Corrigido bug do extrator de ENUM onde valores não informados causavam NullPointerException ao invés de usar o valor padrão.

---
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationEnumValueExtractor.java | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationEnumValueExtractor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationEnumValueExtractor.java
index b286498..8560294 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationEnumValueExtractor.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationEnumValueExtractor.java
@@ -55,20 +55,25 @@ public class ConfigurationEnumValueExtractor implements ConfigurationValueExtrac
 	public Object getValue(String prefix, String key, Field field, Configuration configuration) throws Exception {
 		String value = configuration.getString(prefix + key);
 		
-		Object enums[] = field.getDeclaringClass().getEnumConstants();
-		
-		for (int i=0; i<enums.length; i++){
-			if (enums[i].getClass().getSimpleName().equalsIgnoreCase(value)){
-				return enums[i];
+		if (value!=null){
+			Object enums[] = field.getDeclaringClass().getEnumConstants();
+			
+			for (int i=0; i<enums.length; i++){
+				if (enums[i].getClass().getSimpleName().equalsIgnoreCase(value)){
+					return enums[i];
+				}
 			}
 		}
+		else{
+			return null;
+		}
 		
 		throw new ConversionException(getBundle().getString("configuration-not-conversion",value,field.getDeclaringClass().getCanonicalName()));
 	}
 
 	@Override
 	public boolean isSupported(Field field) {
-		return field.getDeclaringClass().isEnum();
+		return field.getType().isEnum();
 	}
 	
 	private ResourceBundle getBundle(){
--
libgit2 0.21.2