Polishing

Author: sbrannen

spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java

@@ -113,14 +113,15 @@ private static void resetMocks(ApplicationContext applicationContext, MockReset
 
 	private static void resetMocks(ConfigurableApplicationContext applicationContext, MockReset reset) {
 		ConfigurableListableBeanFactory beanFactory = applicationContext.getBeanFactory();
-		String[] beanNames = beanFactory.getBeanDefinitionNames();
 		Set<String> instantiatedSingletons = new HashSet<>(Arrays.asList(beanFactory.getSingletonNames()));
-		for (String beanName : beanNames) {
-			BeanDefinition beanDefinition = beanFactory.getBeanDefinition(beanName);
-			if (beanDefinition.isSingleton() && instantiatedSingletons.contains(beanName)) {
-				Object bean = getBean(beanFactory, beanName);
-				if (bean != null && reset == MockReset.get(bean)) {
-					Mockito.reset(bean);
+		for (String beanName : beanFactory.getBeanDefinitionNames()) {
+			if (instantiatedSingletons.contains(beanName)) {
+				BeanDefinition beanDefinition = beanFactory.getBeanDefinition(beanName);
+				if (beanDefinition.isSingleton()) {
+					Object bean = getBean(beanFactory, beanName);
+					if (bean != null && reset == MockReset.get(bean)) {
+						Mockito.reset(bean);
+					}
 				}
 			}
 		}