You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/07/25 04:00:57 UTC
svn commit: r978959 - in
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation:
BeanStorage.java DefaultConversation.java
Author: gpetracek
Date: Sun Jul 25 02:00:57 2010
New Revision: 978959
URL: http://svn.apache.org/viewvc?rev=978959&view=rev
Log:
EXTCDI-33 cleanup
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java?rev=978959&r1=978958&r2=978959&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java Sun Jul 25 02:00:57 2010
@@ -41,34 +41,15 @@ class BeanStorage implements Serializabl
public BeanEntry getBean(Class beanClass)
{
- synchronized (this)
- {
- BeanEntry<Serializable> beanEntry = this.beanMap.get(beanClass);
-
- if (beanEntry == null)
- {
- return null;
- }
-
- //don't use something like Bean#touch here to ensure that the correct ViewId is used as well
- return addBean(this.beanMap, beanEntry);
- }
+ return this.beanMap.get(beanClass);
}
public BeanEntry addBean(BeanEntry<Serializable> beanEntry)
{
- synchronized (this)
- {
- return addBean(this.beanMap, beanEntry);
- }
- }
-
- private BeanEntry addBean(Map<Class, BeanEntry<Serializable>> beanMap, BeanEntry<Serializable> beanEntry)
- {
//BeanEntryHolder newBean = new BeanEntryHolder(beanHolder);
Class beanClass = beanEntry.getBean().getBeanClass();
- beanMap.remove(beanClass);
- beanMap.put(beanClass, beanEntry);
+ this.beanMap.remove(beanClass);
+ this.beanMap.put(beanClass, beanEntry);
//this.beanAccessedEventEvent.fire(new BeanAccessedEvent(bean.getBeanInstance()));
return beanEntry;
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java?rev=978959&r1=978958&r2=978959&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java Sun Jul 25 02:00:57 2010
@@ -89,8 +89,6 @@ public class DefaultConversation impleme
return null;
}
- touchConversation();
-
BeanEntry scopedBean = this.beanStorage.getBean(key);
if (scopedBean == null)
@@ -98,6 +96,8 @@ public class DefaultConversation impleme
return null;
}
+ touchConversation();
+
return (T) scopedBean.getBeanInstance();
}