Polishing

Author: jhoeller

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

@@ -153,8 +153,7 @@ public Object instantiate(RootBeanDefinition bd, @Nullable String beanName, Bean
 			}
 		}
 		catch (IllegalArgumentException ex) {
-			if (factoryBean != null
-					&& !factoryMethod.getDeclaringClass().isAssignableFrom(factoryBean.getClass())) {
+			if (factoryBean != null && !factoryMethod.getDeclaringClass().isAssignableFrom(factoryBean.getClass())) {
 				throw new BeanInstantiationException(factoryMethod,
 						"Illegal factory instance for factory method '" + factoryMethod.getName() + "'; " +
 						"instance: " + factoryBean.getClass().getName(), ex);

spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java

@@ -642,10 +642,10 @@ private void logInvalidating(CacheOperationContext context, CacheEvictOperation
 	}
 
 	/**
-	 * Collect the {@link CachePutRequest} for all {@link CacheOperation} using
-	 * the specified result value.
+	 * Collect a {@link CachePutRequest} for every {@link CacheOperation}
+	 * using the specified result value.
 	 * @param contexts the contexts to handle
-	 * @param result the result value (never {@code null})
+	 * @param result the result value
 	 * @param putRequests the collection to update
 	 */
 	private void collectPutRequests(Collection<CacheOperationContext> contexts,