From ebe128e940b4c48787ccd73d1f5f153dbc23a519 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 24 Sep 2015 00:33:14 +0200 Subject: [PATCH] Polishing --- .../scripting/support/StandardScriptUtils.java | 2 +- .../AbstractFallbackTransactionAttributeSource.java | 2 ++ .../org/springframework/web/cors/DefaultCorsProcessor.java | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptUtils.java index 50206a7db4..05f62c2a8d 100644 --- a/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptUtils.java +++ b/spring-context/src/main/java/org/springframework/scripting/support/StandardScriptUtils.java @@ -43,7 +43,7 @@ public abstract class StandardScriptUtils { * @param engineName the name of the engine * @return a corresponding ScriptEngine (never {@code null}) * @throws IllegalArgumentException if no matching engine has been found - * @throws IllegalStateException if no matching engine has been found or if + * @throws IllegalStateException if the desired engine failed to initialize */ public static ScriptEngine retrieveEngineByName(ScriptEngineManager scriptEngineManager, String engineName) { ScriptEngine engine = scriptEngineManager.getEngineByName(engineName); diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java index 896278983e..04f1bc2f24 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java @@ -129,6 +129,8 @@ public abstract class AbstractFallbackTransactionAttributeSource implements Tran /** * Same signature as {@link #getTransactionAttribute}, but doesn't cache the result. * {@link #getTransactionAttribute} is effectively a caching decorator for this method. + *

As of 4.1.8, this method can be overridden. + * @since 4.1.8 * @see #getTransactionAttribute */ protected TransactionAttribute computeTransactionAttribute(Method method, Class targetClass) { diff --git a/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java b/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java index 01faea792e..72445bb11c 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.java @@ -37,7 +37,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.util.WebUtils; /** - * Default implementation of {@link CorsProcessor}, as defined by the + * The default implementation of {@link CorsProcessor}, as defined by the * CORS W3C recommendation. * *

Note that when input {@link CorsConfiguration} is {@code null}, this @@ -47,7 +47,7 @@ import org.springframework.web.util.WebUtils; * as a same-origin one. * * @author Sebastien Deleuze - * @author Rossen Stoyanhcev + * @author Rossen Stoyanchev * @since 4.2 */ public class DefaultCorsProcessor implements CorsProcessor {