You are viewing a plain text version of this content. The canonical link for it is here.
Posted to portalapps-dev@portals.apache.org by wo...@apache.org on 2009/10/06 15:17:04 UTC
svn commit: r822261 -
/portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/DefaultHttpReverseProxyServlet.java
Author: woonsan
Date: Tue Oct 6 13:17:03 2009
New Revision: 822261
URL: http://svn.apache.org/viewvc?rev=822261&view=rev
Log:
APA-17: Fixing configuration file loading problem when refresh option is off.
Modified:
portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/DefaultHttpReverseProxyServlet.java
Modified: portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/DefaultHttpReverseProxyServlet.java
URL: http://svn.apache.org/viewvc/portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/DefaultHttpReverseProxyServlet.java?rev=822261&r1=822260&r2=822261&view=diff
==============================================================================
--- portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/DefaultHttpReverseProxyServlet.java (original)
+++ portals/applications/webcontent/trunk/webcontent-jar/src/main/java/org/apache/portals/applications/webcontent/proxy/impl/DefaultHttpReverseProxyServlet.java Tue Oct 6 13:17:03 2009
@@ -62,7 +62,6 @@
import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyException;
import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyNotFoundException;
import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapper;
-import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyPathMapperProvider;
import org.apache.portals.applications.webcontent.proxy.HttpReverseProxyService;
import org.apache.portals.applications.webcontent.rewriter.MappingRewriterController;
import org.apache.portals.applications.webcontent.rewriter.RewriterController;
@@ -678,7 +677,7 @@
{
configResourceFile = new File(getServletContext().getRealPath(configResourcePath));
}
- catch (Exception e)
+ catch (Exception ignore)
{
}
@@ -686,15 +685,20 @@
try
{
- if (configResourceFile != null && configResourceFile.isFile() && configReloadingStrategy != null)
+ configuration = new PropertiesConfiguration();
+
+ if (configResourceFile != null && configResourceFile.isFile())
{
- configuration = new PropertiesConfiguration(configResourceFile);
- configuration.setReloadingStrategy(configReloadingStrategy);
+ configuration.load(configResourceFile);
+
+ if (configReloadingStrategy != null)
+ {
+ configuration.setReloadingStrategy(configReloadingStrategy);
+ }
}
else
{
configInput = getServletContext().getResourceAsStream(configResourcePath);
- configuration = new PropertiesConfiguration();
((PropertiesConfiguration) configuration).load(configInput);
}
}