portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aurel...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler JetspeedProfilerService.java
Date Mon, 17 Nov 2003 14:53:02 GMT
aurelien    2003/11/17 06:53:02

  Modified:    src/java/org/apache/jetspeed/services/profiler
                        JetspeedProfilerService.java
  Log:
  Patch for Bug ID 20246, thx to Jeremy for the correct Patch
  
  PR: Bugzilla #20246
  Obtained from:
  Submitted by:	Jeremy Ford
  
  Revision  Changes    Path
  1.53      +6 -1      jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
  
  Index: JetspeedProfilerService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- JetspeedProfilerService.java	23 Jul 2003 19:50:22 -0000	1.52
  +++ JetspeedProfilerService.java	17 Nov 2003 14:53:02 -0000	1.53
  @@ -298,6 +298,8 @@
               {
                   try
                   {
  +                    String paramRole = rundata.getParameters().getString(Profiler.PARAM_ROLE);
  +                	
                       Iterator roles = JetspeedSecurity.getRoles(user.getUserName());
                       if (roles != null)
                       {
  @@ -311,6 +313,7 @@
                               {
                                   profiles.add(profile);
                               }
  +                            rundata.getParameters().remove(Profiler.PARAM_ROLE);
                           }
                           profile = mergeRoleProfiles(data, profiles);
   
  @@ -320,6 +323,8 @@
                               profile = fallbackProfile(rundata, cm);
                           }
                       }
  +                    
  +                    rundata.getParameters().setString(Profiler.PARAM_ROLE, paramRole);
                   }
                   catch (Exception e)
                   {
  
  
  

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


Mime
View raw message