diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
index 45375f0381..0f169da8b7 100644
--- a/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
+++ b/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -611,7 +611,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 
 	@Override
 	public void setPropertyValue(String propertyName, Object value) throws BeansException {
-		BeanWrapperImpl nestedBw = null;
+		BeanWrapperImpl nestedBw;
 		try {
 			nestedBw = getBeanWrapperForPropertyPath(propertyName);
 		}
@@ -628,7 +628,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 		PropertyTokenHolder tokens = (PropertyTokenHolder) pv.resolvedTokens;
 		if (tokens == null) {
 			String propertyName = pv.getName();
-			BeanWrapperImpl nestedBw = null;
+			BeanWrapperImpl nestedBw;
 			try {
 				nestedBw = getBeanWrapperForPropertyPath(propertyName);
 			}
@@ -647,6 +647,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	private void setPropertyValue(PropertyTokenHolder tokens, PropertyValue pv) throws BeansException {
 		String propertyName = tokens.canonicalName;
 		String actualName = tokens.actualName;
@@ -658,7 +659,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 			getterTokens.actualName = tokens.actualName;
 			getterTokens.keys = new String[tokens.keys.length - 1];
 			System.arraycopy(tokens.keys, 0, getterTokens.keys, 0, tokens.keys.length - 1);
-			Object propValue = null;
+			Object propValue;
 			try {
 				propValue = getPropertyValue(getterTokens);
 			}
@@ -740,8 +741,8 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 				Class mapValueType = GenericCollectionTypeResolver.getMapValueReturnType(
 						pd.getReadMethod(), tokens.keys.length);
 				Map map = (Map) propValue;
-				Object convertedMapKey = null;
-				Object convertedMapValue = null;
+				Object convertedMapKey;
+				Object convertedMapValue;
 				try {
 					// IMPORTANT: Do not pass full property name in here - property editors
 					// must not kick in for map keys but rather only for map values.
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
index 9f88973578..a355ffcb7a 100644
--- a/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
+++ b/org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import java.beans.PropertyEditorSupport;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.SortedSet;
@@ -105,6 +104,7 @@ public class CustomCollectionEditor extends PropertyEditorSupport {
 	 * Convert the given value to a Collection of the target type.
 	 */
 	@Override
+	@SuppressWarnings("unchecked")
 	public void setValue(Object value) {
 		if (value == null && this.nullAsEmptyCollection) {
 			super.setValue(createCollection(this.collectionType, 0));