portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdore...@apache.org
Subject svn commit: r513530 - in /portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core: DefaultOptionalContainerServices.java DefaultUserInfoService.java
Date Thu, 01 Mar 2007 23:15:39 GMT
Author: cdoremus
Date: Thu Mar  1 14:01:53 2007
New Revision: 513530

URL: http://svn.apache.org/viewvc?view=rev&rev=513530
Log:
Patch applied to fix PLUTO-324. Thank you, Chuck!

Modified:
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java?view=diff&rev=513530&r1=513529&r2=513530
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java
(original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java
Thu Mar  1 14:01:53 2007
@@ -55,6 +55,7 @@
         portletEnvironmentService = new DefaultPortletEnvironmentService();
         portletInfoService = new DefaultPortletInfoService();
         portalAdministrationService = new DefaultPortalAdministrationService();
+        userInfoService = new DefaultUserInfoService();
     }
     
     /**
@@ -93,6 +94,10 @@
             portalAdministrationService = root.getPortalAdministrationService();
         }
 
+		 if(root.getUserInfoService() != null) {
+			 userInfoService = root.getUserInfoService();
+		 }
+
     }
     
     
@@ -127,8 +132,5 @@
         return userInfoService;
     }
 
-    public void setUserInfoService(UserInfoService userInfoService) {
-        this.userInfoService = userInfoService;
-    }
 }
 

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java?view=diff&rev=513530&r1=513529&r2=513530
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java
(original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java
Thu Mar  1 14:01:53 2007
@@ -32,7 +32,14 @@
     private Map userInfoMap = new HashMap();
 
     public Map getUserInfo(PortletRequest request) throws PortletContainerException {
-        return (Map)userInfoMap.get(request.getRemoteUser());
+        Map retval = null;
+        if ( request.getRemoteUser() != null ) {
+        	retval= (Map)userInfoMap.get(request.getRemoteUser());
+        }
+        if ( retval == null ) {
+        	retval = new HashMap();
+        }
+        return retval;
     }
 
     public void setUserInfo(String userName, Map userInfoMap) {



Mime
View raw message