master
Juergen Hoeller 9 years ago
parent c34a62e141
commit ebe128e940
  1. 2
      spring-context/src/main/java/org/springframework/scripting/support/StandardScriptUtils.java
  2. 2
      spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
  3. 4
      spring-web/src/main/java/org/springframework/web/cors/DefaultCorsProcessor.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);

@ -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.
* <p>As of 4.1.8, this method can be overridden.
* @since 4.1.8
* @see #getTransactionAttribute
*/
protected TransactionAttribute computeTransactionAttribute(Method method, Class<?> targetClass) {

@ -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
* <a href="http://www.w3.org/TR/cors/">CORS W3C recommendation</a>.
*
* <p>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 {

Loading…
Cancel
Save