Always cancel timer when we're done, even if an exception is thrown. C…

…loses #540

History.md

@@ -1,5 +1,6 @@
 ## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.1.3...master) (not released)
 
+* [Core] Always cancel tomeout at the end of a stepdef, even when it fails. ([#540](https://github.com/cucumber/cucumber-jvm/issues/540) irb1s)
 * [Groovy] Updated examples to be more explanatory and groovier syntax ([#537](https://github.com/cucumber/cucumber-jvm/pull/522) Quantoid)
 * [Core] [Picocontainer] Not shading the artifact any longer. Groovy, Jython, and Jruby are still shading it. ([#522](https://github.com/cucumber/cucumber-jvm/pull/522) Dmytro Chyzhykov)
 * [Core] The `json-pretty` formatter is gone, and the `json` formatter is pretty!

core/src/main/java/cucumber/runtime/Timeout.java

@@ -22,12 +22,14 @@ public void run() {
                 }
             }, timeoutMillis, TimeUnit.MILLISECONDS);
             try {
-                T result = callback.call();
-                timer.cancel(true);
-                return result;
+                return callback.call();
             } catch (InterruptedException timeout) {
                 throw new TimeoutException("Timed out after " + timeoutMillis + "ms.");
+            } finally {
+                done.set(true);
+                timer.cancel(true);
             }
+
         }
     }