jmcnally 02/01/20 17:25:45
Modified: src/java/org/apache/turbine/services/pull
TurbinePullService.java
Log:
context.remove(key) is returning key. This does not seem like the correct
behavior, though it appears that is possibly originates with velocity's Context
implementation. Using get(key) instead. Could debug further, but jvz is talking
like he might dump the whole context abstractions stuff, so i am just noting
the problem.
Revision Changes Path
1.9 +6 -3
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TurbinePullService.java 4 Sep 2001 19:14:03 -0000 1.8
+++ TurbinePullService.java 21 Jan 2002 01:25:45 -0000 1.9
@@ -144,7 +144,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
- * @version $Id: TurbinePullService.java,v 1.8 2001/09/04 19:14:03 dlr Exp $
+ * @version $Id: TurbinePullService.java,v 1.9 2002/01/21 01:25:45 jmcnally Exp $
*/
public class TurbinePullService
extends BaseService
@@ -635,8 +635,11 @@
while (it.hasNext())
{
ToolData toolData = (ToolData)it.next();
- Object tool = context.remove(toolData.toolName);
-
+ // FIXME! context.remove(key) is returning key, though this is not
+ // what the TemplateContext interface specifies.
+ //Object tool = context.remove(toolData.toolName);
+ Object tool = context.get(toolData.toolName);
+ context.remove(toolData.toolName);
if (tool != null)
{
pool.putInstance(tool);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
