From 6d3a0d5735bda7c9cf36cbe578961d1a3c8581f7 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Sun, 23 Nov 2014 00:05:27 +0100
Subject: [PATCH] Polishing

---
 .../springframework/ui/freemarker/SpringTemplateLoader.java | 6 +++---
 .../main/java/org/springframework/core/MethodParameter.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/SpringTemplateLoader.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/SpringTemplateLoader.java
index 9c72aa17ab..2e0e740550 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/SpringTemplateLoader.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/SpringTemplateLoader.java
@@ -28,9 +28,9 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 
 /**
- * FreeMarker TemplateLoader adapter that loads via a Spring ResourceLoader.
- * Used by FreeMarkerConfigurationFactory for any resource loader path that
- * cannot be resolved to a java.io.File.
+ * FreeMarker {@link TemplateLoader} adapter that loads via a Spring {@link ResourceLoader}.
+ * Used by {@link FreeMarkerConfigurationFactory} for any resource loader path that cannot
+ * be resolved to a {@link java.io.File}.
  *
  * @author Juergen Hoeller
  * @since 14.03.2004
diff --git a/spring-core/src/main/java/org/springframework/core/MethodParameter.java b/spring-core/src/main/java/org/springframework/core/MethodParameter.java
index 20c576620d..0174d137ee 100644
--- a/spring-core/src/main/java/org/springframework/core/MethodParameter.java
+++ b/spring-core/src/main/java/org/springframework/core/MethodParameter.java
@@ -127,14 +127,14 @@ public class MethodParameter {
 		this.method = original.method;
 		this.constructor = original.constructor;
 		this.parameterIndex = original.parameterIndex;
+		this.nestingLevel = original.nestingLevel;
+		this.typeIndexesPerLevel = original.typeIndexesPerLevel;
 		this.containingClass = original.containingClass;
 		this.parameterType = original.parameterType;
 		this.genericParameterType = original.genericParameterType;
 		this.parameterAnnotations = original.parameterAnnotations;
 		this.parameterNameDiscoverer = original.parameterNameDiscoverer;
 		this.parameterName = original.parameterName;
-		this.nestingLevel = original.nestingLevel;
-		this.typeIndexesPerLevel = original.typeIndexesPerLevel;
 	}