Author: tfischer
Date: Tue Jul 19 13:54:01 2011
New Revision: 1148323
URL: http://svn.apache.org/viewvc?rev=1148323&view=rev
Log:
move variable store handling to beforeExecute and afterExecute,
so not every outlet implementation needs to implement variable store handling
Modified:
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java
Modified:
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java?rev=1148323&r1=1148322&r2=1148323&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
(original)
+++
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
Tue Jul 19 13:54:01 2011
@@ -159,6 +159,7 @@ public abstract class OutletImpl impleme
throws GeneratorException
{
controllerState.pushOutlet(this);
+ controllerState.getVariableStore().startOutlet();
if (log.isDebugEnabled())
{
log.debug("Executing outlet "
@@ -171,6 +172,7 @@ public abstract class OutletImpl impleme
public void afterExecute(ControllerState controllerState)
{
+ controllerState.getVariableStore().endOutlet();
controllerState.popOutlet();
}
Modified:
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java?rev=1148323&r1=1148322&r2=1148323&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java
(original)
+++
db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/velocity/VelocityOutlet.java
Tue Jul 19 13:54:01 2011
@@ -205,7 +205,6 @@ public class VelocityOutlet extends Temp
{
log.debug("Start executing VelocityOutlet " + getName());
}
- controllerState.getVariableStore().startOutlet();
try
{
@@ -263,7 +262,6 @@ public class VelocityOutlet extends Temp
}
finally
{
- controllerState.getVariableStore().endOutlet();
if (log.isDebugEnabled())
{
log.debug("End executing VelocityOutlet " + getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
