Skip to content

Nicholas Irving (nirving@darkedges.com) #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.1-master
Choose a base branch
from
Open

Nicholas Irving (nirving@darkedges.com) #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 36 additions & 22 deletions ...tiles2/src/main/java/org/thymeleaf/extras/tiles2/renderer/ThymeleafAttributeRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,37 @@ public class ThymeleafAttributeRenderer
private static final String SPRING4_STANDARD_DIALECT_CLASS_NAME =
"org.thymeleaf.spring4.dialect.SpringStandardDialect";




/** Fixed an issue where the ClassLoader was being hit heavily to check to see if
what Spring Dialect was being used. Now check from one class instead of the Class
Loader
**/
final static Class<?> spring3StandardDialectClass = getSpring3StandardDialectClassname();
final static Class<?> spring4StandardDialectClass = getSpring4StandardDialectClassname();

public ThymeleafAttributeRenderer() {
super();
}

private static Class<?> getSpring3StandardDialectClassname() {
Class<?> springStandardDialectClass = null;
try {
springStandardDialectClass = Class
.forName(SPRING3_STANDARD_DIALECT_CLASS_NAME);
} catch (ClassNotFoundException e) {
}
return springStandardDialectClass;
}


private static Class<?> getSpring4StandardDialectClassname() {
Class<?> springStandardDialectClass = null;
try {
springStandardDialectClass = Class
.forName(SPRING4_STANDARD_DIALECT_CLASS_NAME);
} catch (ClassNotFoundException e) {
}
return springStandardDialectClass;
}

@Override
public void write(final Object value, final Attribute attribute,
Expand Down Expand Up @@ -187,37 +209,29 @@ private static TilesFragment computeTemplateSelector(final TemplateEngine templa

}




/** Fixed an issue where the ClassLoader was being hit heavily to check to see if
what Spring Dialect was being used. Now check from one class instead of the Class
Loader
**/
private static boolean isStandardDialectPresent(final TemplateEngine templateEngine) {

try {
final Class<?> springStandardDialectClass =
Class.forName(SPRING3_STANDARD_DIALECT_CLASS_NAME);
if (isDialectPresent(templateEngine, springStandardDialectClass)) {

if (spring3StandardDialectClass != null)
if (isDialectPresent(templateEngine, spring3StandardDialectClass)) {
return true;
}
} catch (final ClassNotFoundException e) {
// nothing to do, just do other checks
}

try {
final Class<?> springStandardDialectClass =
Class.forName(SPRING4_STANDARD_DIALECT_CLASS_NAME);
if (isDialectPresent(templateEngine, springStandardDialectClass)) {
if (spring4StandardDialectClass != null)
if (isDialectPresent(templateEngine, spring4StandardDialectClass)) {
return true;
}
} catch (final ClassNotFoundException e) {
// nothing to do, just do other checks
}

return isDialectPresent(templateEngine, StandardDialect.class);

}



/** Beed to clean this up to improve performance
**/
private static boolean isDialectPresent(final TemplateEngine templateEngine, final Class<?> dialectClass) {
for (final IDialect dialect : templateEngine.getDialects()) {
if (dialectClass.isAssignableFrom(dialect.getClass())) {
Expand Down