Author: rdonkin
Date: Sat Jun 30 06:14:59 2007
New Revision: 552144
URL: http://svn.apache.org/viewvc?view=rev&rev=552144
Log:
Restore manager when exception thrown
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java?view=diff&rev=552144&r1=552143&r2=552144
==============================================================================
---
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java
(original)
+++
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java
Sat Jun 30 06:14:59 2007
@@ -54,13 +54,17 @@
ConditionManager oldManager = ConditionManager.getInstance();
ConditionManager.resetInstance();
- // Execute the Block
- Object result = block.execute(mail);
-
- // Restore the old ConditionManager
- ConditionManager.setInstance(oldManager);
-
- return result;
+ try
+ {
+ // Execute the Block
+ Object result = block.execute(mail);
+ return result;
+ }
+ finally
+ {
+ // Always restore the old ConditionManager
+ ConditionManager.setInstance(oldManager);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
