You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/02/28 18:22:02 UTC

svn commit: r512854 - /incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java

Author: agilliland
Date: Wed Feb 28 09:22:01 2007
New Revision: 512854

URL: http://svn.apache.org/viewvc?view=rev&rev=512854
Log:
refresh entries needs to maintain use of proxy config.


Modified:
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java

Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java?view=diff&rev=512854&r1=512853&r2=512854
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java Wed Feb 28 09:22:01 2007
@@ -53,6 +53,7 @@
 import org.apache.roller.planet.pojos.PlanetSubscriptionData;
 import org.apache.roller.planet.util.rome.DiskFeedInfoCache;
 import org.apache.roller.planet.business.AbstractManagerImpl;
+import org.apache.roller.planet.config.PlanetRuntimeConfig;
 
 
 /**
@@ -342,12 +343,13 @@
         FeedFetcherCache feedInfoCache =
                 new DiskFeedInfoCache(cacheDirName);
         
-        /*if (config.getProxyHost()!=null && config.getProxyPort() > 0) {
+        String proxyHost = PlanetRuntimeConfig.getProperty("site.proxyhost");
+        int proxyPort = PlanetRuntimeConfig.getIntProperty("site.proxyport");
+        if (proxyHost != null && proxyPort > 0) {
             System.setProperty("proxySet", "true");
-            System.setProperty("http.proxyHost", config.getProxyHost());
-            System.setProperty("http.proxyPort",
-                    Integer.toString(config.getProxyPort()));
-        }*/
+            System.setProperty("http.proxyHost", proxyHost);
+            System.setProperty("http.proxyPort", Integer.toString(proxyPort));
+        }
         
         /** a hack to set 15 sec timeouts for java.net.HttpURLConnection */
         System.setProperty("sun.net.client.defaultConnectTimeout", "15000");