dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merging from upstream WebGoat

Browse Source 
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Jason White 2015-04-24 07:04:30 -04:00
commit 22c4ed27e4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
View File

@ -523,6 +523,7 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
// System.out.println("Solution: " + getLessonSolutionFileName()); // System.out.println("Solution: " + getLessonSolutionFileName());
src = readFromFile(new BufferedReader(new FileReader(getLessonSolutionFileName())), false); src = readFromFile(new BufferedReader(new FileReader(getLessonSolutionFileName())), false);
} catch (Exception e) { } catch (Exception e) {
logger.error("Could not find solution for {}", getLessonSolutionFileName());
s.setMessage("Could not find the solution file"); s.setMessage("Could not find the solution file");
src = ("Could not find the solution file or solution file does not exist.<br/>" src = ("Could not find the solution file or solution file does not exist.<br/>"
+ "Send this message to: <a href=\"mailto:" + s.getWebgoatContext().getFeedbackAddress() + "Send this message to: <a href=\"mailto:" + s.getWebgoatContext().getFeedbackAddress()

2
src/main/java/org/owasp/webgoat/session/Course.java
View File

@ -315,7 +315,7 @@ public class Course {
lesson.setLessonPlanFileName(lessonPlan.getKey(), lessonPlan.getValue().toString()); lesson.setLessonPlanFileName(lessonPlan.getKey(), lessonPlan.getValue().toString());
} }
if (plugin.getLessonSolution("en").isPresent()) { if (plugin.getLessonSolution("en").isPresent()) {
lesson.setLessonSolutionFileName(plugin.getLessonSolution("en").toString()); lesson.setLessonSolutionFileName(plugin.getLessonSolution("en").get().toString());
} }
if (plugin.getLessonSource().isPresent()) { if (plugin.getLessonSource().isPresent()) {
lesson.setSourceFileName(plugin.getLessonSource().get().toString()); lesson.setSourceFileName(plugin.getLessonSource().get().toString());