addressing code style removed comments and addressed review comments

Author: Michael Wiles

spring-integration-core/src/main/java/org/springframework/integration/config/DefaultConfiguringBeanFactoryPostProcessor.java

@@ -85,6 +85,7 @@
  * @author Oleg Zhurakousky
  * @author Artem Bilan
  * @author Gary Russell
+ * @author Michael Wiles
  *
  * @see IntegrationContextUtils
  */
@@ -183,12 +184,11 @@ private void registerNullChannel() {
 								.getBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME);
 					}
 				}
-				// don't think it will hurt to always find the parent
 				if (beanFactory instanceof HierarchicalBeanFactory) {
 					beanFactory = ((HierarchicalBeanFactory) beanFactory).getParentBeanFactory();
 				}
-				// will definitely be found as containsBean returned true - but also want to be defensive in case of NPE
-			} while (nullChannelDefinition == null && beanFactory != null); // not sure if beanFactroy not null is necessary
+			}
+			while (nullChannelDefinition == null);
 
 			if (nullChannelDefinition != null &&
 					!NullChannel.class.getName().equals(nullChannelDefinition.getBeanClassName())) {

spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java

@@ -90,6 +90,7 @@
 import org.springframework.integration.config.GlobalChannelInterceptor;
 import org.springframework.integration.config.IntegrationConverter;
 import org.springframework.integration.config.SpelFunctionFactoryBean;
+import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.core.MessagingTemplate;
 import org.springframework.integration.endpoint.AbstractEndpoint;
@@ -136,6 +137,7 @@
 /**
  * @author Artem Bilan
  * @author Gary Russell
+ * @author Michael Wiles
  *
  * @since 4.0
  */
@@ -471,27 +473,35 @@ public void testMessagingGateway() throws InterruptedException {
 	}
 
 	/**
-	 * Just creates an interim context to confirm that the DefaultConfiguringBeanFactoryPostProcessor 
-	 * does not fail when there is an extra application context in the hierarchy.
+	 * Just creates an interim context to confirm that the
+	 * DefaultConfiguringBeanFactoryPostProcessor does not fail when there is an extra
+	 * application context in the hierarchy.
 	 */
 	@Test
 	public void testDoubleParentChildAnnotationConfiguration() {
+
+		assertThat(this.context.containsBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME)).isTrue();
+
 		AnnotationConfigApplicationContext parent;
 		parent = new AnnotationConfigApplicationContext();
 		parent.register(ChildConfiguration.class);
 		parent.setParent(this.context);
 		parent.refresh();
 
+		assertThat(parent.containsBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME)).isFalse();
+
 		AnnotationConfigApplicationContext child;
 		child = new AnnotationConfigApplicationContext();
 		child.register(ChildConfiguration.class);
 		child.setParent(parent);
 		child.refresh();
 
+		assertThat(child.containsBeanDefinition(IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME)).isFalse();
+
 		parent.close();
 		child.close();
 	}
-	
+
 	@Test
 	public void testParentChildAnnotationConfiguration() {
 		AnnotationConfigApplicationContext child = new AnnotationConfigApplicationContext();