portals-portalapps-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r884183 - /portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/portlet/WebContentPortlet.java
Date Wed, 25 Nov 2009 16:32:55 GMT
Author: woonsan
Date: Wed Nov 25 16:32:55 2009
New Revision: 884183

URL: http://svn.apache.org/viewvc?rev=884183&view=rev
Log:
APA-24: Fixing a problem that proxy host is set every time.

Modified:
    portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/portlet/WebContentPortlet.java

Modified: portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/portlet/WebContentPortlet.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/portlet/WebContentPortlet.java?rev=884183&r1=884182&r2=884183&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/portlet/WebContentPortlet.java
(original)
+++ portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/portlet/WebContentPortlet.java
Wed Nov 25 16:32:55 2009
@@ -540,8 +540,11 @@
         {
         }
         
-        ProxyHost proxyHostObject = (proxyPort == -1 ? new ProxyHost(proxyHost) : new ProxyHost(proxyHost,
proxyPort));
-        client.getHostConfiguration().setProxyHost(proxyHostObject);
+        if (proxyHost != null && !"".equals(proxyHost.trim()))
+        {
+            ProxyHost proxyHostObject = (proxyPort == -1 ? new ProxyHost(proxyHost.trim())
: new ProxyHost(proxyHost.trim(), proxyPort));
+            client.getHostConfiguration().setProxyHost(proxyHostObject);
+        }
         
         // reuse existing state, if we have been here before
         Cookie[] cookies = (Cookie[])PortletMessaging.receive(request, HTTP_STATE);



Mime
View raw message