From f42da75682dcab370a8609ca0ad2f6c9e4e8a504 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Thu, 21 Apr 2011 08:07:12 +0000
Subject: [PATCH] SPR-8238 + add NPE test

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4231 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../cache/config/AbstractAnnotationTest.java      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/org.springframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTest.java b/org.springframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTest.java
index 3ba54a5a4fc..d6873e07292 100644
--- a/org.springframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTest.java
+++ b/org.springframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTest.java
@@ -148,6 +148,11 @@ public abstract class AbstractAnnotationTest {
 		assertTrue(cache.containsKey(expectedKey));
 	}
 
+	public void testNullArg(CacheableService service) {
+		Object r1 = service.cache(null);
+		assertSame(r1, service.cache(null));
+	}
+
 	@Test
 	public void testCacheable() throws Exception {
 		testCacheable(cs);
@@ -226,4 +231,14 @@ public abstract class AbstractAnnotationTest {
 	public void testClassRootVars() throws Exception {
 		testRootVars(ccs);
 	}
+
+	@Test
+	public void testNullArg() throws Exception {
+		testNullArg(cs);
+	}
+
+	@Test
+	public void testClassNullArg() throws Exception {
+		testNullArg(ccs);
+	}
 }
\ No newline at end of file