Merge

1 files changed, 2 insertions, 2 deletions

diff --git a/Source/VCGeneration/ConditionGeneration.cs b/Source/VCGeneration/ConditionGeneration.cs
index e3991f93..e0ef2aed 100644
--- a/Source/VCGeneration/ConditionGeneration.cs
+++ b/Source/VCGeneration/ConditionGeneration.cs
@@ -976,7 +976,7 @@ namespace VC {
 

     protected Checker FindCheckerFor(int timeout, bool isBlocking = true)

     {

-      Contract.Ensures(Contract.Result<Checker>() != null);

+      Contract.Ensures(!isBlocking || Contract.Result<Checker>() != null);

 

       var maxRetries = 3;

       lock (checkers)

@@ -1191,7 +1191,7 @@ namespace VC {
     protected Dictionary<Variable, Expr> ComputeIncarnationMap(Block b, Dictionary<Block, Dictionary<Variable, Expr>> block2Incarnation) {

       Contract.Requires(b != null);

       Contract.Requires(block2Incarnation != null);

-      Contract.Ensures(Contract.Result<Hashtable>() != null);

+      Contract.Ensures(Contract.Result<Dictionary<Variable, Expr>>() != null);

 

       if (b.Predecessors.Count == 0) {

         return new Dictionary<Variable, Expr>();