Merge branch '2.3' of git@github.com:demoiselle/framework.git into 2.3

Wilson Guimarães
2 parents 70c96c51 db4c8d3f
Showing 1 changed file with 2 additions and 2 deletions Show diff stats
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/JsfLocaleProducer.java
@@ -45,7 +45,7 @@ public class JsfLocaleProducer implements Serializable {
 	@Named("currentLocale")
 	public Locale create() {
 		Locale locale;
-
+		
 		try {
 			FacesContext facesContext = Beans.getReference(FacesContext.class);
  
@@ -60,7 +60,7 @@ public class JsfLocaleProducer implements Serializable {
 			}
 			locale = facesContext.getApplication().getDefaultLocale();
  
-		} catch (ContextNotActiveException cause) {
+		} catch (Exception cause) {
 			locale = Locale.getDefault();
 		}
...	...	@@ -45,7 +45,7 @@ public class JsfLocaleProducer implements Serializable {
45	45	@Named("currentLocale")
46	46	public Locale create() {
47	47	Locale locale;
48		-
	48	+
49	49	try {
50	50	FacesContext facesContext = Beans.getReference(FacesContext.class);
51	51
...	...	@@ -60,7 +60,7 @@ public class JsfLocaleProducer implements Serializable {
60	60	}
61	61	locale = facesContext.getApplication().getDefaultLocale();
62	62
63		- } catch (ContextNotActiveException cause) {
	63	+ } catch (Exception cause) {
64	64	locale = Locale.getDefault();
65	65	}
66	66
...	...