dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15256
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-05-13 14:30:19 +0200
message:
  in apps-servlet, just do a 404 if file is not found, current 'html5 compatible' solution didn't really work
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AppController.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AppController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AppController.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AppController.java	2014-05-13 12:30:19 +0000
@@ -135,13 +135,8 @@
 
         if ( resource == null )
         {
-            resource = findResource( locations, application.getLaunchPath() );
-
-            if ( resource == null )
-            {
-                response.sendError( HttpServletResponse.SC_NOT_FOUND );
-                return;
-            }
+            response.sendError( HttpServletResponse.SC_NOT_FOUND );
+            return;
         }
 
         if ( new ServletWebRequest( request ).checkNotModified( resource.lastModified() ) )