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/05/03 04:26:26 UTC
svn commit: r652973 -
/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
Author: ate
Date: Fri May 2 19:26:26 2008
New Revision: 652973
URL: http://svn.apache.org/viewvc?rev=652973&view=rev
Log:
synchronizing with PortletApp.contextPath property renamed to .id
Modified:
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java?rev=652973&r1=652972&r2=652973&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Fri May 2 19:26:26 2008
@@ -376,7 +376,7 @@
}
public String getContextPath() {
- String contextPath = portletWindow.getPortletEntity().getPortletDefinition().getApplication().getContextPath();
+ String contextPath = portletWindow.getPortletEntity().getPortletDefinition().getApplication().getId();
if ("/".equals(contextPath)) {
contextPath = "";
}
@@ -483,11 +483,14 @@
final UserInfoService userInfoService = optionalContainerServices.getUserInfoService();
userInfoMap = userInfoService.getUserInfo( this, this.portletWindow );
+ if (userInfoMap != null)
+ {
+ userInfoMap = Collections.unmodifiableMap(userInfoMap);
+ }
} catch (PortletContainerException e) {
LOG.warn("Unable to retrieve user attribute map for user " + getRemoteUser() + ". Returning null.");
- return null;
}
- return Collections.unmodifiableMap(userInfoMap);
+ return userInfoMap;
}