You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2003/02/18 23:09:11 UTC

cvs commit: jakarta-turbine-3/src/java/org/apache/turbine/services/pull TurbinePullService.java

dlr         2003/02/18 14:09:11

  Modified:    src/java/org/apache/turbine/services/pull
                        TurbinePullService.java
  Log:
  * src/java/org/apache/turbine/services/pull/TurbinePullService.java
    releaseTools(): Noted that DefaultTemplateContext should now do the
    Right Thing.
  
  Revision  Changes    Path
  1.16      +6 -2      jakarta-turbine-3/src/java/org/apache/turbine/services/pull/TurbinePullService.java
  
  Index: TurbinePullService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/services/pull/TurbinePullService.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -u -r1.15 -r1.16
  --- TurbinePullService.java	24 Apr 2002 20:03:25 -0000	1.15
  +++ TurbinePullService.java	18 Feb 2003 22:09:11 -0000	1.16
  @@ -618,7 +618,8 @@
        * @param pool an instance of the PoolService
        * @param tools a List of ToolData objects
        */
  -    private void releaseTools(TemplateContext context, PoolService pool, List tools)
  +    private void releaseTools(TemplateContext context, PoolService pool,
  +                              List tools)
       {
           Iterator it = tools.iterator();
           while (it.hasNext())
  @@ -626,6 +627,9 @@
               ToolData toolData = (ToolData)it.next();
               // FIXME! context.remove(key) is returning key, though this is not
               // what the TemplateContext interface specifies.
  +            // UPDATE: As of Feb 18, 2003, Fulcrum's
  +            // DefaultTemplateContext uses HashMap.remove(Object),
  +            // which should return the value.
               //Object tool = context.remove(toolData.toolName);
               Object tool = context.get(toolData.toolName);
               context.remove(toolData.toolName);
  
  
  

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