Merge pull request DSpace#861 from tdonohue/DS-2278

DS-2278 : Fix two issues in XMLUI which block proper 404 error pages from displaying for some URL patterns
helix84 · Feb 23, 2015 · 229396d · 229396d
2 parents 0db8178 + b009562
commit 229396d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/dspace-xmlui/src/main/java/org/dspace/springmvc/ResourceIdentifierController.java b/dspace-xmlui/src/main/java/org/dspace/springmvc/ResourceIdentifierController.java
@@ -66,7 +66,7 @@ public String processHandle(HttpServletRequest request, @PathVariable String pre
 
             DSpaceObject dso = dis.resolve(context, prefix);
 
-            if (dso == null) throw new RuntimeException("Cannot find Item!");
+            if (dso == null) throw new IdentifierNotFoundException("Cannot find Item " + prefix + "!");
 
             request.setAttribute(DSPACE_OBJECT, dso);
 

diff --git a/dspace-xmlui/src/main/webapp/sitemap.xmap b/dspace-xmlui/src/main/webapp/sitemap.xmap
@@ -646,6 +646,14 @@
                         <map:read src="static/{1}/{2}"/>
                     </map:match>
 
+                    <!-- DSpace does not have any paths beginning with numbers (0-9). If one is accessed,
+                         assume that it is an identifier & redirect it. This also avoids an internal
+                         error, where the XMLUI AspectMatcher wrongly assumes numbers at beginning
+                         of path are direct references to individual Aspects in the aspect chain.-->
+                    <map:match type="regexp" pattern="(^[0-9]+\/?.*$)">
+                        <map:redirect-to uri="{request:contextPath}/handle/{1}" permanent="yes"/>
+                    </map:match>
+
                 </map:pipeline>
 
                 <!-- pipline to run external handle server -->