SPR-6423, generics added to attribute map methods of the conversation object

Micha Kiener · Micha Kiener · commit af0bb1920f92 · 2010-03-09T08:11:48.000Z
diff --git a/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationImpl.java b/org.springframework.context/src/main/java/org/springframework/conversation/manager/ConversationImpl.java
@@ -101,20 +101,21 @@ public ConversationImpl() {
 	 * 
 	 * @see org.springframework.conversation.Conversation#getAttribute(java.lang.String)
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T getAttribute(String name) {
 		touch();
 
 		// first try to get the attribute from this conversation state
-		T value = super.getAttribute(name);
+		T value = (T) super.getAttribute(name);
 		if (value != null) {
 			return value;
 		}
 
 		// the value was not found, try the parent conversation, if any and if
 		// not isolated
 		if (parent != null && !isolated) {
-			return parent.getAttribute(name);
+			return (T) parent.getAttribute(name);
 		}
 
 		// this is the root conversation and the requested bean is not
@@ -142,10 +143,11 @@ public <T> T setAttribute(String name, T value) {
 	/**
 	 * @see org.springframework.conversation.Conversation#removeAttribute(java.lang.String)
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T removeAttribute(String name) {
 		touch();
-		T value = super.removeAttribute(name);
+		T value = (T) super.removeAttribute(name);
 
 		// if the attribute implements the listener interface, remove it from
 		// the registered listeners
