hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-15 14:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #853 from tuub/DS-2435

Browse Source 
DS-2435: JSPUI send 400 Bad Request for non-existent browse index
This commit is contained in:
Pascal-Nicolas Becker
2015-02-03 15:22:31 +01:00
parent 5b6819cefe ade3ceb994
commit 5e6a640ce6
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/browse/BrowserScope.java
View File

@@ -354,7 +354,7 @@ public class BrowserScope
*/ */
public void setResultsPerPage(int resultsPerPage) public void setResultsPerPage(int resultsPerPage)
{ {
if (resultsPerPage > -1 || browseIndex.isTagCloudEnabled()) if (resultsPerPage > -1 || (browseIndex != null && browseIndex.isTagCloudEnabled()))
{ {
this.resultsPerPage = resultsPerPage; this.resultsPerPage = resultsPerPage;
} }

9
dspace-jspui/src/main/java/org/dspace/app/webui/servlet/AbstractBrowserServlet.java
View File

@@ -14,6 +14,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.dspace.app.webui.util.UIUtil; import org.dspace.app.webui.util.UIUtil;
import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.AuthorizeException;
@@ -110,12 +111,14 @@ public abstract class AbstractBrowserServlet extends DSpaceServlet
// process the input, performing some inline validation // process the input, performing some inline validation
BrowseIndex bi = null; BrowseIndex bi = null;
if (type != null && !"".equals(type)) if (StringUtils.isNotEmpty(type))
{ {
bi = BrowseIndex.getBrowseIndex(type); bi = BrowseIndex.getBrowseIndex(type);
} }
if (bi == null) // don't override a requested index, if no index is set,
// try to find it on a possibly specified sort option.
if (type == null && bi == null)
{ {
if (sortBy > 0) if (sortBy > 0)
{ {
@@ -168,7 +171,7 @@ public abstract class AbstractBrowserServlet extends DSpaceServlet
} }
// if no resultsperpage set, default to 20 - if tag cloud enabled, leave it as is! // if no resultsperpage set, default to 20 - if tag cloud enabled, leave it as is!
if (resultsperpage < 0 && !bi.isTagCloudEnabled()) if (bi != null && resultsperpage < 0 && !bi.isTagCloudEnabled())
{ {
resultsperpage = 20; resultsperpage = 20;
} }