You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2008/10/08 17:26:23 UTC
svn commit: r702909 - in
/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto:
core/PortletContainerImpl.java internal/impl/BaseURLImpl.java
Author: ate
Date: Wed Oct 8 08:26:23 2008
New Revision: 702909
URL: http://svn.apache.org/viewvc?rev=702909&view=rev
Log:
Reapplying PLUTO-484 fix
Modified:
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java?rev=702909&r1=702908&r2=702909&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java Wed Oct 8 08:26:23 2008
@@ -539,7 +539,7 @@
redirectURL.setAction(false);
// Set secure of the redirect URL if necessary.
- if (request.isSecure()) {
+ if (redirectURL.isSecureSupported()) {
try {
redirectURL.setSecure();
} catch (PortletSecurityException e) {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java?rev=702909&r1=702908&r2=702909&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/BaseURLImpl.java Wed Oct 8 08:26:23 2008
@@ -184,7 +184,9 @@
.getPortalCallbackService()
.getPortletURLProvider(servletRequest, portletWindow);
if(urlProvider.isSecureSupported()) {
- throw new PortletSecurityException("Secure URLs not supported.");
+ urlProvider.setSecure();
+ } else {
+ LOG.info("Secure URLs not supported.");
}
}