OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-04 23:55:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIXED HUDSON-1841] proxy setting shouldn't be global to JVM.

Browse Source 
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@10078 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2008-06-13 17:54:16 +00:00
1 parent 1a5d0d13ef
commit 0543909074
5 files changed
+88 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/PluginManager.java
+9 -10
View File
@@ -186,19 +186,18 @@ public final class PluginManager extends AbstractModelObject {
}
public void doProxyConfigure(@QueryParameter("proxy.server") String server, @QueryParameter("proxy.port") String port, StaplerResponse rsp) throws IOException {
setProp("http.proxyHost", Util.fixEmptyAndTrim(server));
setProp("http.proxyPort",Util.fixEmptyAndTrim(port));
setProp("https.proxyHost", Util.fixEmptyAndTrim(server));
setProp("https.proxyPort",Util.fixEmptyAndTrim(port));
Hudson hudson = Hudson.getInstance();
server = Util.fixEmptyAndTrim(server);
if(server==null) {
hudson.proxy = null;
ProxyConfiguration.getXmlFile().delete();
} else {
hudson.proxy = new ProxyConfiguration(server,Integer.parseInt(Util.fixEmptyAndTrim(port)));
hudson.proxy.save();
}
rsp.sendRedirect("./advanced");
}
private void setProp(String key, String value) {
// System.setProperty causes NPE if t he value is null.
if(value==null) System.getProperties().remove(key);
else System.setProperty(key,value);
}
/**
* Uploads a plugin.
*/