DefaultListableBeanFactory leniently deserializes into dummy factory if serialization id not resolvable

Issue: SPR-14117

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

@@ -1449,16 +1449,14 @@ public SerializedBeanFactoryReference(String id) {
 
 		private Object readResolve() {
 			Reference<?> ref = serializableFactories.get(this.id);
-			if (ref == null) {
-				throw new IllegalStateException(
-						"Cannot deserialize BeanFactory with id " + this.id + ": no factory registered for this id");
-			}
-			Object result = ref.get();
-			if (result == null) {
-				throw new IllegalStateException(
-						"Cannot deserialize BeanFactory with id " + this.id + ": factory has been garbage-collected");
+			if (ref != null) {
+				Object result = ref.get();
+				if (result != null) {
+					return result;
+				}
 			}
-			return result;
+			// Lenient fallback: dummy factory in case of original factory not found...
+			return new StaticListableBeanFactory(Collections.<String, Object> emptyMap());
 		}
 	}
 

spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -18,7 +18,6 @@
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,6 +34,7 @@
 import org.springframework.beans.factory.SmartFactoryBean;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
@@ -59,7 +59,31 @@
 public class StaticListableBeanFactory implements ListableBeanFactory {
 
 	/** Map from bean name to bean instance */
-	private final Map<String, Object> beans = new HashMap<String, Object>();
+	private final Map<String, Object> beans;
+
+
+	/**
+	 * Create a regular {@code StaticListableBeanFactory}, to be populated
+	 * with singleton bean instances through {@link #addBean} calls.
+	 */
+	public StaticListableBeanFactory() {
+		this.beans = new LinkedHashMap<String, Object>();
+	}
+
+	/**
+	 * Create a {@code StaticListableBeanFactory} wrapping the given {@code Map}.
+	 * <p>Note that the given {@code Map} may be pre-populated with beans;
+	 * or new, still allowing for beans to be registered via {@link #addBean};
+	 * or {@link java.util.Collections#emptyMap()} for a dummy factory which
+	 * enforces operating against an empty set of beans.
+	 * @param beans a {@code Map} for holding this factory's beans, with the
+	 * bean name String as key and the corresponding singleton object as value
+	 * @since 4.3
+	 */
+	public StaticListableBeanFactory(Map<String, Object> beans) {
+		Assert.notNull(beans, "Beans Map must not be null");
+		this.beans = beans;
+	}
 
 
 	/**
@@ -265,7 +289,7 @@ public <T> Map<String, T> getBeansOfType(Class<T> type, boolean includeNonSingle
 			throws BeansException {
 
 		boolean isFactoryType = (type != null && FactoryBean.class.isAssignableFrom(type));
-		Map<String, T> matches = new HashMap<String, T>();
+		Map<String, T> matches = new LinkedHashMap<String, T>();
 
 		for (Map.Entry<String, Object> entry : this.beans.entrySet()) {
 			String beanName = entry.getKey();