From f1105812afe1f3785d58c7a353abe76d02219c31 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 14 Aug 2012 00:36:59 +0200 Subject: [PATCH] Polish Spring MVC ContextLoader This commit polishes the exception message thrown by customizeContext() for greater readability. --- .../java/org/springframework/web/context/ContextLoader.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java index 79702474ad2..1bed723d77a 100644 --- a/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java +++ b/spring-web/src/main/java/org/springframework/web/context/ContextLoader.java @@ -470,17 +470,18 @@ public class ContextLoader { return; } + Class contextClass = applicationContext.getClass(); ArrayList> initializerInstances = new ArrayList>(); for (Class> initializerClass : initializerClasses) { - Class contextClass = applicationContext.getClass(); Class initializerContextClass = GenericTypeResolver.resolveTypeArgument(initializerClass, ApplicationContextInitializer.class); Assert.isAssignable(initializerContextClass, contextClass, String.format( "Could not add context initializer [%s] as its generic parameter [%s] " + "is not assignable from the type of application context used by this " + - "context loader [%s]", initializerClass.getName(), initializerContextClass, contextClass)); + "context loader [%s]: ", initializerClass.getName(), initializerContextClass.getName(), + contextClass.getName())); initializerInstances.add(BeanUtils.instantiateClass(initializerClass)); }