File tree Expand file tree Collapse file tree 2 files changed +6
-5
lines changed
spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3
spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2 Expand file tree Collapse file tree 2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change 116
116
*
117
117
* @author mick semb wever
118
118
* @author Rossen Stoyanchev
119
+ * @author Juergen Hoeller
119
120
* @since 3.2
120
121
* @see TilesView
121
122
* @see TilesViewResolver
@@ -315,7 +316,7 @@ protected BaseLocaleUrlDefinitionDAO instantiateLocaleDefinitionDao(ApplicationC
315
316
LocaleResolver resolver ) {
316
317
BaseLocaleUrlDefinitionDAO dao = super .instantiateLocaleDefinitionDao (applicationContext , resolver );
317
318
if (checkRefresh && dao instanceof CachingLocaleUrlDefinitionDAO ) {
318
- ((CachingLocaleUrlDefinitionDAO ) dao ).setCheckRefresh (checkRefresh );
319
+ ((CachingLocaleUrlDefinitionDAO ) dao ).setCheckRefresh (true );
319
320
}
320
321
return dao ;
321
322
}
@@ -354,7 +355,8 @@ protected DefinitionsFactory createDefinitionsFactory(ApplicationContext applica
354
355
protected PreparerFactory createPreparerFactory (ApplicationContext context ) {
355
356
if (preparerFactoryClass != null ) {
356
357
return BeanUtils .instantiate (preparerFactoryClass );
357
- } else {
358
+ }
359
+ else {
358
360
return super .createPreparerFactory (context );
359
361
}
360
362
}
@@ -394,7 +396,6 @@ private static class SpringCompleteAutoloadTilesContainerFactory extends Complet
394
396
protected LocaleResolver createLocaleResolver (ApplicationContext applicationContext ) {
395
397
return new SpringLocaleResolver ();
396
398
}
397
-
398
399
}
399
400
400
401
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2013 the original author or authors.
2
+ * Copyright 2002-2014 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.
@@ -326,7 +326,7 @@ protected BaseLocaleUrlDefinitionDAO instantiateLocaleDefinitionDao(TilesApplica
326
326
BaseLocaleUrlDefinitionDAO dao = super .instantiateLocaleDefinitionDao (
327
327
applicationContext , contextFactory , resolver );
328
328
if (checkRefresh && dao instanceof CachingLocaleUrlDefinitionDAO ) {
329
- ((CachingLocaleUrlDefinitionDAO ) dao ).setCheckRefresh (checkRefresh );
329
+ ((CachingLocaleUrlDefinitionDAO ) dao ).setCheckRefresh (true );
330
330
}
331
331
return dao ;
332
332
}
You can’t perform that action at this time.
0 commit comments