From b78fa2715a6a0ee7070dadd9647e4a112fd425cb Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Thu, 21 Mar 2013 11:12:30 +0100
Subject: [PATCH] Assigned cache manager name in order to avoid EhCache
 assertion failure in case of multiple tests executed on the same VM

---
 .../org/springframework/cache/ehcache/EhCacheSupportTests.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java
index 09a42c9e1f..3d3c7ec99e 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java
@@ -90,6 +90,7 @@ public class EhCacheSupportTests extends TestCase {
 			if (useCacheManagerFb) {
 				cacheManagerFb = new EhCacheManagerFactoryBean();
 				cacheManagerFb.setConfigLocation(new ClassPathResource("testEhcache.xml", getClass()));
+				cacheManagerFb.setCacheManagerName("cache");
 				cacheManagerFb.afterPropertiesSet();
 				cacheManagerFbInitialized = true;
 				cacheFb.setCacheManager(cacheManagerFb.getObject());