lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2016-10-10 17:44:57 +08:00
parent 689cdca004
commit c887a9dc4c
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/redkale/net/http/RestHttpServlet.java
View File

@@ -5,7 +5,7 @@
*/ */
package org.redkale.net.http; package org.redkale.net.http;
import java.io.IOException; import java.io.*;
import org.redkale.util.Attribute; import org.redkale.util.Attribute;
/** /**
@@ -20,11 +20,18 @@ public abstract class RestHttpServlet<T> extends HttpBaseServlet {
protected abstract T currentUser(HttpRequest req) throws IOException; protected abstract T currentUser(HttpRequest req) throws IOException;
protected void finishJson(final HttpResponse response, RestOutput output) throws IOException { protected void finishJson(final HttpResponse response, RestOutput output) throws IOException {
if (output != null) { if (output == null) {
response.addHeader(output.getHeaders()); response.finishJson(output);
response.addCookie(output.getCookies()); return;
}
response.addHeader(output.getHeaders());
response.addCookie(output.getCookies());
if (output.getResult() instanceof File) {
response.finish((File) output.getResult());
} else {
response.finishJson(output.getResult());
} }
response.finishJson(output == null ? null : output.getResult());
} }
protected void finishJsResult(final HttpResponse response, final String var, RestOutput output) throws IOException { protected void finishJsResult(final HttpResponse response, final String var, RestOutput output) throws IOException {