Merge branch 'cassandra-2.1' into trunk

2014-09-14 13:51:08 +01:00 · 2014-09-14 13:51:08 +01:00 · 58985409c9
parent 14b1c96072 a6678a273d
commit 58985409c9
1 changed files with 2 additions and 0 deletions
--- a/tools/stress/src/org/apache/cassandra/stress/util/Timing.java
+++ b/tools/stress/src/org/apache/cassandra/stress/util/Timing.java
@ -73,6 +73,8 @@ public class Timing
        }
        catch (Exception e)
        {
+            if (e instanceof InterruptedException)
+                throw (InterruptedException) e;
            throw new RuntimeException(e);
        }