Skip to content

ticket 1586: avoid NPE if template is not found and applicationClass is null #536

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

Merged
pepite merged 1 commit into from
Dec 29, 2012
Merged

ticket 1586: avoid NPE if template is not found and applicationClass is null #536

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
9 changes: 6 additions & 3 deletions framework/src/play/mvc/Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import play.Logger;
import play.Play;
import play.classloading.ApplicationClasses;
import play.classloading.ApplicationClasses.ApplicationClass;
import play.classloading.enhancers.ContinuationEnhancer;
import play.classloading.enhancers.ControllersEnhancer.ControllerInstrumentation;
import play.classloading.enhancers.ControllersEnhancer.ControllerSupport;
Expand Down Expand Up @@ -664,10 +665,12 @@ protected static void renderTemplate(String templateName, Map<String,Object> arg
}
StackTraceElement element = PlayException.getInterestingStrackTraceElement(ex);
if (element != null) {
throw new TemplateNotFoundException(templateName, Play.classes.getApplicationClass(element.getClassName()), element.getLineNumber());
} else {
throw ex;
ApplicationClass applicationClass = Play.classes.getApplicationClass(element.getClassName());
if (applicationClass != null) {
throw new TemplateNotFoundException(templateName, applicationClass, element.getLineNumber());
}
}
throw ex;
}
}

Expand Down