mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-18 14:32:22 +00:00
Merged revisions 26194 via svnmerge from
https://svn.dev.java.net/svn/hudson/branches/rc ........ r26194 | kohsuke | 2010-01-21 11:38:14 -0800 (Thu, 21 Jan 2010) | 2 lines Fixed a regression in the remote API in 1.341. ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@26195 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
cdf17e99ce
commit
fa13013ca8
2 files changed
+21
-14
No files matched your search
@@ -42,6 +42,7 @@ import javax.xml.transform.stream.StreamResult;
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
||||
import java.io.StringWriter;
|
||||
import java.io.Writer;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -141,21 +142,27 @@ public class Api extends AbstractModelObject {
|
||||
throw new IOException2(e);
|
||||
}
|
||||
|
||||
if(result instanceof CharacterData) {
|
||||
rsp.setContentType("text/plain");
|
||||
rsp.getCompressedWriter(req).write(((CharacterData)result).getText());
|
||||
return;
|
||||
}
|
||||
Writer w = rsp.getCompressedWriter(req);
|
||||
|
||||
if(result instanceof String || result instanceof Number || result instanceof Boolean) {
|
||||
rsp.setContentType("text/plain");
|
||||
rsp.getCompressedWriter(req).write(result.toString());
|
||||
return;
|
||||
}
|
||||
try {
|
||||
if(result instanceof CharacterData) {
|
||||
rsp.setContentType("text/plain");
|
||||
w.write(((CharacterData)result).getText());
|
||||
return;
|
||||
}
|
||||
|
||||
// otherwise XML
|
||||
rsp.setContentType("application/xml;charset=UTF-8");
|
||||
new XMLWriter(rsp.getCompressedWriter(req)).write(result);
|
||||
if(result instanceof String || result instanceof Number || result instanceof Boolean) {
|
||||
rsp.setContentType("text/plain");
|
||||
w.write(result.toString());
|
||||
return;
|
||||
}
|
||||
|
||||
// otherwise XML
|
||||
rsp.setContentType("application/xml;charset=UTF-8");
|
||||
new XMLWriter(w).write(result);
|
||||
} finally {
|
||||
w.close();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user