fix path of resources, fix null case

b2ad69f3 · Tim Levett · ddee07d0 · b2ad69f3 · b2ad69f3
Commit b2ad69f3 authored 9 years ago by Tim Levett
--- a/myuw-error-valve/pom.xml
+++ b/myuw-error-valve/pom.xml
@@ -31,7 +31,7 @@
    <finalName>myuw-error-valve</finalName>
    <resources>
      <resource>
-        <directory>../ROOT/src/main/webapp</directory>
+        <directory>../myuw-root-webapp/src/main/webapp</directory>
        <includes>
          <include>*.html</include>
        </includes>

--- a/myuw-error-valve/src/main/java/edu/wisc/my/root/MyUWErrorValve.java
+++ b/myuw-error-valve/src/main/java/edu/wisc/my/root/MyUWErrorValve.java
@@ -35,7 +35,10 @@ public class MyUWErrorValve extends ErrorReportValve implements Valve {
      }
      try {
        in = MyUWErrorValve.class.getResourceAsStream(page);
-        
+        if(in == null) {
+          //page missing or something, revert to simpler times
+          response.getWriter().write("<html><head><title>Error: "+ statusCode + "</title></head><body>"+ statusCode + "</body><html>");
+        }
        int c;
        while ((c = in.read()) != -1) {
          response.getWriter().write(c);