From 600e74b6c94c38fab787b9092b498de9dcbde074 Mon Sep 17 00:00:00 2001
From: Karsten Sperling <karsten@sperling.co.nz>
Date: Thu, 7 Jan 2016 22:57:20 +1300
Subject: [PATCH] Avoid double-reg when a Servlet or Filter implements
 ServletContextInitializer

See gh-4902
---
 .../boot/web/servlet/ServletContextInitializerBeans.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
index 9fa88ff166..3ee21b054d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -121,7 +121,7 @@ public class ServletContextInitializerBeans
 		}
 		else {
 			addServletContextInitializerBean(ServletContextInitializer.class, beanName,
-					initializer, beanFactory, null);
+					initializer, beanFactory, initializer);
 		}
 	}