You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by im...@apache.org on 2007/08/11 10:26:27 UTC

svn commit: r564857 - /myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/BeanDefinitionConversationNameAttrDecorator.java

Author: imario
Date: Sat Aug 11 01:26:27 2007
New Revision: 564857

URL: http://svn.apache.org/viewvc?view=rev&rev=564857
Log:
ORCHESTRA-2: avoid npe with spring 2.0.6. Thanks to Dan Tran for the patch!

Modified:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/BeanDefinitionConversationNameAttrDecorator.java

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/BeanDefinitionConversationNameAttrDecorator.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/BeanDefinitionConversationNameAttrDecorator.java?view=diff&rev=564857&r1=564856&r2=564857
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/BeanDefinitionConversationNameAttrDecorator.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/BeanDefinitionConversationNameAttrDecorator.java Sat Aug 11 01:26:27 2007
@@ -39,6 +39,6 @@
 			definition.getBeanDefinition().setAttribute(CONVERSATION_NAME_ATTRIBUTE, conversationName);
 		}
 
-		return null;
+		return definition;
 	}
 }