Merge branch 'pull-428'

Moved the changelog entry to the trunk part.
This commit is contained in:
Kohsuke Kawaguchi committed 2012-06-05 18:22:43 -07:00
commit d3f233ddf4
2 files changed
+8 -1

No files matched your search

+3
View File
@@ -55,6 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=bug>
Fixed: XML API Logs Too Much Information When Invalid Char is Present
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-13378">issue 13378</a>)
<li class=rfe>
Reduce the total height of items shown in the view configuration page.
(<a href="https://github.com/jenkinsci/jenkins/pull/488">pull 488</a>)
+5 -1
View File
@@ -45,6 +45,8 @@ import java.io.OutputStream;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
* Used to expose remote access API for ".../api/"
@@ -142,7 +144,8 @@ public class Api extends AbstractModelObject {
}
} catch (DocumentException e) {
throw new IOException2("Failed to do XPath/wrapper handling. XML is as follows:"+sw,e);
LOGGER.log(Level.FINER, "Failed to do XPath/wrapper handling. XML is as follows:"+sw, e);
throw new IOException2("Failed to do XPath/wrapper handling. Turn on FINER logging to view XML.",e);
}
OutputStream o = rsp.getCompressedOutputStream(req);
@@ -191,5 +194,6 @@ public class Api extends AbstractModelObject {
rsp.serveExposedBean(req,bean, Flavor.PYTHON);
}
private static final Logger LOGGER = Logger.getLogger(Api.class.getName());
private static final ModelBuilder MODEL_BUILDER = new ModelBuilder();
}