From fa6bf5494cc10be35b5bc2175b50dcfa66803af6 Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Wed, 18 Sep 2013 08:20:37 -0300
Subject: [PATCH] OPEN - issue FWK-128: Erro ao utilizar anotações Bean Validation nas classes @Configuration  

---
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationImpl.java    | 11 +++++++++--
 impl/core/src/test/java/configuration/field/beanvalidation/ConfigurationBeanValidationFieldTest.java | 12 +++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationImpl.java
index 28e0d23..658331a 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationImpl.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationImpl.java
@@ -49,10 +49,17 @@ public class ConfigurationImpl implements Serializable {
 	private boolean loaded = false;
 
 	@SuppressWarnings("unused")
-	private synchronized void load(Object instance) {
+	private synchronized void load(Object instance) throws Throwable {
 		if (!loaded) {
-			Beans.getReference(ConfigurationLoader.class).load(instance);
 			loaded = true;
+
+			try {
+				Beans.getReference(ConfigurationLoader.class).load(instance);
+
+			} catch (Throwable cause) {
+				loaded = false;
+				throw cause;
+			}
 		}
 	}
 }
diff --git a/impl/core/src/test/java/configuration/field/beanvalidation/ConfigurationBeanValidationFieldTest.java b/impl/core/src/test/java/configuration/field/beanvalidation/ConfigurationBeanValidationFieldTest.java
index 5e278e8..4396a4a 100644
--- a/impl/core/src/test/java/configuration/field/beanvalidation/ConfigurationBeanValidationFieldTest.java
+++ b/impl/core/src/test/java/configuration/field/beanvalidation/ConfigurationBeanValidationFieldTest.java
@@ -42,8 +42,6 @@ import static junit.framework.Assert.fail;
 import javax.inject.Inject;
 import javax.validation.ConstraintViolationException;
 
-import junit.framework.Assert;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -107,14 +105,14 @@ public class ConfigurationBeanValidationFieldTest {
 			propertyBeanValidationWithEmptyNotNullFieldConfig.getIntAttributeNull();
 			fail();
 		} catch (ConfigurationException cause) {
-			Assert.assertEquals(ConstraintViolationException.class, cause.getCause().getClass());
+			assertEquals(ConstraintViolationException.class, cause.getCause().getClass());
 		}
 
 		try {
 			xmlBeanValidationWithEmptyNotNullFieldConfig.getIntAttributeNull();
 			fail();
 		} catch (ConfigurationException cause) {
-			Assert.assertEquals(ConstraintViolationException.class, cause.getCause().getClass());
+			assertEquals(ConstraintViolationException.class, cause.getCause().getClass());
 		}
 	}
 
@@ -124,14 +122,14 @@ public class ConfigurationBeanValidationFieldTest {
 			propertyBeanValidationWithEmptyNotNullFieldConfig.getStringAttributeNull();
 			fail();
 		} catch (ConfigurationException cause) {
-			Assert.assertEquals(ConstraintViolationException.class, cause.getCause().getClass());
+			assertEquals(ConstraintViolationException.class, cause.getCause().getClass());
 		}
 
 		try {
 			xmlBeanValidationWithEmptyNotNullFieldConfig.getStringAttributeNull();
 			fail();
 		} catch (ConfigurationException cause) {
-			Assert.assertEquals(ConstraintViolationException.class, cause.getCause().getClass());
+			assertEquals(ConstraintViolationException.class, cause.getCause().getClass());
 		}
 	}
 
@@ -141,7 +139,7 @@ public class ConfigurationBeanValidationFieldTest {
 			propertyWithTwoConstrainViolations.getAttributeWithTwoConstrainValidations();
 			fail();
 		} catch (ConfigurationException cause) {
-			Assert.assertEquals(ConstraintViolationException.class, cause.getCause().getClass());
+			assertEquals(ConstraintViolationException.class, cause.getCause().getClass());
 		}
 	}
 }
--
libgit2 0.21.2