portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r708041 - /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java
Date Sun, 26 Oct 2008 21:09:47 GMT
Author: ate
Date: Sun Oct 26 14:09:47 2008
New Revision: 708041

URL: http://svn.apache.org/viewvc?rev=708041&view=rev
Log:
JS2-871 - Upgrade Pluto container to version 2.0
See:  http://issues.apache.org/jira/browse/JS2-871
- fixing incorrectly (automatically) refactored getName() method
- getUserInfo() for an unauthenticated user should return null, for an authenticated user
it *might* return some data  

Modified:
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java?rev=708041&r1=708040&r2=708041&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java
(original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portal/src/main/java/org/apache/jetspeed/userinfo/impl/AbstractUserInfoManagerImpl.java
Sun Oct 26 14:09:47 2008
@@ -80,7 +80,7 @@
                             if ((currentAttribute.getName()).equals(currentAttributeRef.getNameLink()))
                             {
                                 if (log.isDebugEnabled())
-                                    log.debug("Linking user attribute ref: [[name, " + currentAttribute.getPortletName()
+                                    log.debug("Linking user attribute ref: [[name, " + currentAttribute.getName()
                                             + "], [linked name, " + currentAttributeRef.getName()
+ "]]");
                                 linkedUserAttributes.add(currentAttributeRef);
                                 linkedAttribute = true;
@@ -112,9 +112,9 @@
     public Map<String, String> getUserInfo(PortletRequest request, PortletWindow window)
throws PortletContainerException
     {
         String remoteUser = request.getRemoteUser(); 
-        if ( remoteUser != null ) 
+        if ( remoteUser == null ) 
         {
-            return Collections.EMPTY_MAP;
+            return null;
         }
         RequestContext requestContext=(RequestContext)request.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
         return this.getUserInfoMap(window.getPortletEntity().getPortletDefinition().getApplication().getName(),
requestContext);        



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message