Changed signature of convertValue() to keep the Sun compiler happy

org.springframework.expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java

@@ -111,9 +111,9 @@ public class ExpressionTestsUsingCoreConversionService extends ExpressionTestCas
 		}
 
 		@SuppressWarnings("unchecked")
-		public <T> T convertValue(Object value, TypeDescriptor typeDescriptor)
+		public Object convertValue(Object value, TypeDescriptor typeDescriptor)
 				throws EvaluationException {
-			return (T)super.executeConversion(value, typeDescriptor);
+			return super.executeConversion(value, typeDescriptor);
 		}
 		
 	}

org.springframework.expression/src/test/java/org/springframework/expression/spel/SpringEL300Tests.java

@@ -0,0 +1,30 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.expression.spel;
+
+/**
+ * Tests based on Jiras up to the release of Spring 3.0.0
+ * 
+ * @author Andy Clement
+ */
+public class SpringEL300Tests extends ExpressionTestCase {
+
+	public void testNPE_5661() {
+		evaluate("joinThreeStrings('a',null,'c')", "anullc", String.class);
+	}
+
+}