Polishing

jhoeller · jhoeller · commit b4f83dbdc3b4 · 2018-05-07T14:30:50.000+02:00
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,17 +33,15 @@
 import org.springframework.util.Assert;
 
 /**
- * Implementation of AspectJ ProceedingJoinPoint interface
- * wrapping an AOP Alliance MethodInvocation.
+ * An implementation of the AspectJ {@link ProceedingJoinPoint} interface
+ * wrapping an AOP Alliance {@link org.aopalliance.intercept.MethodInvocation}.
  *
- * <p><b>Note</b>: the {@code getThis()} method returns the current Spring AOP proxy.
+ * <p><b>Note</b>: The {@code getThis()} method returns the current Spring AOP proxy.
  * The {@code getTarget()} method returns the current Spring AOP target (which may be
- * {@code null} if there is no target), and is a plain POJO without any advice.
- * <b>If you want to call the object and have the advice take effect, use
- * {@code getThis()}.</b> A common example is casting the object to an
- * introduced interface in the implementation of an introduction.
- *
- * <p>Of course there is no such distinction between target and proxy in AspectJ.
+ * {@code null} if there is no target instance) as a plain POJO without any advice.
+ * <b>If you want to call the object and have the advice take effect, use {@code getThis()}.</b>
+ * A common example is casting the object to an introduced interface in the implementation of
+ * an introduction. There is no such distinction between target and proxy in AspectJ itself.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -58,7 +56,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 	private final ProxyMethodInvocation methodInvocation;
 
 	@Nullable
-	private Object[] defensiveCopyOfArgs;
+	private Object[] args;
 
 	/** Lazily initialized signature object */
 	@Nullable
@@ -79,6 +77,7 @@ public MethodInvocationProceedingJoinPoint(ProxyMethodInvocation methodInvocatio
 		this.methodInvocation = methodInvocation;
 	}
 
+
 	@Override
 	public void set$AroundClosure(AroundClosure aroundClosure) {
 		throw new UnsupportedOperationException();
@@ -120,20 +119,18 @@ public Object getTarget() {
 
 	@Override
 	public Object[] getArgs() {
-		if (this.defensiveCopyOfArgs == null) {
-			Object[] argsSource = this.methodInvocation.getArguments();
-			this.defensiveCopyOfArgs = new Object[argsSource.length];
-			System.arraycopy(argsSource, 0, this.defensiveCopyOfArgs, 0, argsSource.length);
+		if (this.args == null) {
+			this.args = this.methodInvocation.getArguments().clone();
 		}
-		return this.defensiveCopyOfArgs;
+		return this.args;
 	}
 
 	@Override
 	public Signature getSignature() {
 		if (this.signature == null) {
 			this.signature = new MethodSignatureImpl();
 		}
-		return signature;
+		return this.signature;
 	}
 
 	@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -201,7 +201,7 @@ private String registerResourceHandler(ParserContext context, Element element,
 
 
 	private CacheControl parseCacheControl(Element element) {
-		CacheControl cacheControl = CacheControl.empty();
+		CacheControl cacheControl;
 		if ("true".equals(element.getAttribute("no-cache"))) {
 			cacheControl = CacheControl.noCache();
 		}
@@ -211,6 +211,10 @@ else if ("true".equals(element.getAttribute("no-store"))) {
 		else if (element.hasAttribute("max-age")) {
 			cacheControl = CacheControl.maxAge(Long.parseLong(element.getAttribute("max-age")), TimeUnit.SECONDS);
 		}
+		else {
+			cacheControl = CacheControl.empty();
+		}
+
 		if ("true".equals(element.getAttribute("must-revalidate"))) {
 			cacheControl = cacheControl.mustRevalidate();
 		}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2017 the original author or authors.`
	`2`	`+ * Copyright 2002-2018 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -201,7 +201,7 @@ private String registerResourceHandler(ParserContext context, Element element,`
`201`	`201`
`202`	`202`
`203`	`203`	`private CacheControl parseCacheControl(Element element) {`
`204`		`- CacheControl cacheControl = CacheControl.empty();`
	`204`	`+ CacheControl cacheControl;`
`205`	`205`	`if ("true".equals(element.getAttribute("no-cache"))) {`
`206`	`206`	`cacheControl = CacheControl.noCache();`
`207`	`207`	`}`
`@@ -211,6 +211,10 @@ else if ("true".equals(element.getAttribute("no-store"))) {`
`211`	`211`	`else if (element.hasAttribute("max-age")) {`
`212`	`212`	`cacheControl = CacheControl.maxAge(Long.parseLong(element.getAttribute("max-age")), TimeUnit.SECONDS);`
`213`	`213`	`}`
	`214`	`+ else {`
	`215`	`+ cacheControl = CacheControl.empty();`
	`216`	`+ }`
	`217`	`+`
`214`	`218`	`if ("true".equals(element.getAttribute("must-revalidate"))) {`
`215`	`219`	`cacheControl = cacheControl.mustRevalidate();`
`216`	`220`	`}`