Sorry for the whitespace stuff, I thought I reverted them.

This one is the real patch:
> Author: imario
> Date: Sat Dec  8 05:05:14 2007
> New Revision: 602459
>
> URL: http://svn.apache.org/viewvc?rev=602459&view=rev
> Log:
> fixed regression regarding viewController scope
>
> Modified:
>     
> myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/AbstractSpringOrchestraScope.java
> @@ -231,13 +231,11 @@
>               Object proxy = 
> beanDefinition.getAttribute(ScopedBeanTargetSource.class.getName());
>               if (proxy == null)
>               {
>                       if (log.isDebugEnabled())
>                       {
>                               log.debug("getProxy: creating proxy for " + 
> beanName);
>                       }
> -                     String conversationName = (String) 
> beanDefinition.getAttribute(BeanDefinitionConversationNameAttrDecorator.CONVERSATION_NAME_ATTRIBUTE);
> -                     if (conversationName == null)
> -                             conversationName = beanName;
> +                     String conversationName = 
> getConversationNameForBean(beanName);
>                       BeanFactory beanFactory = 
> applicationContext.getBeanFactory();
>                       proxy = _SpringUtils.newProxy(this, conversationName, 
> beanName, objectFactory, beanFactory);
>                       
> beanDefinition.setAttribute(ScopedBeanTargetSource.class.getName(), proxy);
>   

Ciao,
Mario

Reply via email to