Commit 4ec19ed8 authored by D's avatar D Committed by GitHub

Merge pull request #12183 from b3log/1.7.0-dev

Fix #12182
parents 80a8e419 6b276b87
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
*/ */
package org.b3log.solo.processor; package org.b3log.solo.processor;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import javax.inject.Inject; import javax.inject.Inject;
...@@ -39,12 +37,11 @@ import org.b3log.solo.processor.util.Filler; ...@@ -39,12 +37,11 @@ import org.b3log.solo.processor.util.Filler;
import org.b3log.solo.service.PreferenceQueryService; import org.b3log.solo.service.PreferenceQueryService;
import org.json.JSONObject; import org.json.JSONObject;
/** /**
* Error processor. * Error processor.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.2, Jul 11, 2012 * @version 1.0.1.2, Oct 9, 2016
* @since 0.4.5 * @since 0.4.5
*/ */
@RequestProcessor @RequestProcessor
...@@ -80,25 +77,25 @@ public class ErrorProcessor { ...@@ -80,25 +77,25 @@ public class ErrorProcessor {
/** /**
* Shows the user template page. * Shows the user template page.
* *
* @param context the specified context * @param context the specified context
* @param request the specified HTTP servlet request * @param request the specified HTTP servlet request
* @param response the specified HTTP servlet response * @param response the specified HTTP servlet response
* @throws IOException io exception * @throws IOException io exception
*/ */
@RequestProcessing(value = "/error/*.html", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/error/*.html", method = HTTPRequestMethod.GET)
public void showErrorPage(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response) public void showErrorPage(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response)
throws IOException { throws IOException {
final String requestURI = request.getRequestURI(); final String requestURI = request.getRequestURI();
String templateName = StringUtils.substringAfterLast(requestURI, "/"); String templateName = StringUtils.substringAfterLast(requestURI, "/");
templateName = StringUtils.substringBefore(templateName, ".") + ".ftl"; templateName = StringUtils.substringBefore(templateName, ".") + ".ftl";
LOGGER.log(Level.DEBUG, "Shows error page[requestURI={0}, templateName={1}]", new Object[] {requestURI, templateName}); LOGGER.log(Level.DEBUG, "Shows error page[requestURI={0}, templateName={1}]", new Object[]{requestURI, templateName});
final ConsoleRenderer renderer = new ConsoleRenderer(); final ConsoleRenderer renderer = new ConsoleRenderer();
context.setRenderer(renderer); context.setRenderer(renderer);
renderer.setTemplateName("error" + File.separatorChar + templateName); renderer.setTemplateName("error/" + templateName);
final Map<String, Object> dataModel = renderer.getDataModel(); final Map<String, Object> dataModel = renderer.getDataModel();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment