SPR-6421, conversation store

mosoft521 · Jan 4, 2010 · a22d0d0 · a22d0d0
1 parent 9dd9c83
commit a22d0d0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...ext/src/main/java/org/springframework/conversation/manager/AbstractConversationStore.java b/...ext/src/main/java/org/springframework/conversation/manager/AbstractConversationStore.java
@@ -103,7 +103,12 @@ public int size() {
 	 */
 	protected Map<String, Conversation> getConversationMapSafe() {
 		try {
-			return getConversationMap();
+			Map<String, Conversation> conversationMap = getConversationMap();
+			if (conversationMap == null && isUseFallbackMap()) {
+				return getConversationMapFallback();
+			}
+
+			return conversationMap;
 		} catch (Exception e) {
 			// if the map is not reachable and fallback is on, return the
 			// fallback map