Download as
Browse Code »

Commit c56eee52e94c45fa6d777decda2dbffbd639e09a

Authored by Dancovich
1 parent e2d97c25
Exists in master

Revertendo alteração que armazenava um bean manager por classloader, 

causa problemas com aplicações contidas em um pacote EAR.
Showing 1 changed file with 6 additions and 14 deletions   Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Beans.java
  Diff comments   View file @c56eee5
@@ -40,10 +40,7 @@ import java.lang.annotation.Annotation; @@ -40,10 +40,7 @@ import java.lang.annotation.Annotation;
40 import java.lang.reflect.Member; 40 import java.lang.reflect.Member;
41 import java.lang.reflect.Type; 41 import java.lang.reflect.Type;
42 import java.util.Arrays; 42 import java.util.Arrays;
43 -import java.util.Collections;  
44 -import java.util.HashMap;  
45 import java.util.HashSet; 43 import java.util.HashSet;
46 -import java.util.Map;  
47 import java.util.NoSuchElementException; 44 import java.util.NoSuchElementException;
48 import java.util.Set; 45 import java.util.Set;
49 46
@@ -66,24 +63,19 @@ import br.gov.frameworkdemoiselle.DemoiselleException; @@ -66,24 +63,19 @@ import br.gov.frameworkdemoiselle.DemoiselleException;
66 */ 63 */
67 public final class Beans { 64 public final class Beans {
68 65
69 - private static final Map<ClassLoader, BeanManager> beanManagerCache = Collections  
70 - .synchronizedMap(new HashMap<ClassLoader, BeanManager>());  
71 - 66 + private static BeanManager beanManager = null;
  67 +
72 private Beans() { 68 private Beans() {
73 } 69 }
74 70
75 - public static void setBeanManager(BeanManager beanManager) {  
76 - beanManagerCache.put(getCurrentClassLoader(), beanManager); 71 + public static void setBeanManager(BeanManager manager) {
  72 + beanManager = manager;
77 } 73 }
78 74
79 public static BeanManager getBeanManager() { 75 public static BeanManager getBeanManager() {
80 - return beanManagerCache.get(getCurrentClassLoader());  
81 - }  
82 -  
83 - private static ClassLoader getCurrentClassLoader() {  
84 - return Thread.currentThread().getContextClassLoader(); 76 + return beanManager;
85 } 77 }
86 - 78 +
87 /** 79 /**
88 * Obtains a injectble instance of a bean, which have the given required type and qualifiers, and are available for 80 * Obtains a injectble instance of a bean, which have the given required type and qualifiers, and are available for
89 * injection in the point where this method was call. 81 * injection in the point where this method was call.