| commit | 5669c6967bbdd540f27aeebf5a2c258bc4defbe3 | [log] [tgz] |
|---|---|---|
| author | Carl Yeksigian <carl@apache.org> | Wed Feb 03 09:44:01 2016 -0500 |
| committer | Carl Yeksigian <carl@apache.org> | Wed Feb 03 09:44:01 2016 -0500 |
| tree | d24dc0e0205dac9458514f405105a439c78999f5 | |
| parent | de24ee94f355042f24f04c3dec8c1c50000e4ec3 [diff] | |
| parent | b9bdd9ec648ad42d88b1377fe0e1e4ff3d162a91 [diff] |
Merge branch 'cassandra-3.0' into cassandra-3.3
diff --git a/src/java/org/apache/cassandra/db/Mutation.java b/src/java/org/apache/cassandra/db/Mutation.java index 746b226..4bad781 100644 --- a/src/java/org/apache/cassandra/db/Mutation.java +++ b/src/java/org/apache/cassandra/db/Mutation.java
@@ -215,7 +215,7 @@ } catch (ExecutionException e) { - Throwables.propagate(e.getCause()); + throw Throwables.propagate(e.getCause()); } }
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java index 985a036..e0518a9 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -148,7 +148,7 @@ } catch (ExecutionException e) { - Throwables.propagate(e.getCause()); + throw Throwables.propagate(e.getCause()); } clr.keyspacesRecovered.add(keyspace);
diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosState.java b/src/java/org/apache/cassandra/service/paxos/PaxosState.java index d4fed51..0b3af8f 100644 --- a/src/java/org/apache/cassandra/service/paxos/PaxosState.java +++ b/src/java/org/apache/cassandra/service/paxos/PaxosState.java
@@ -146,7 +146,7 @@ } catch (ExecutionException e) { - Throwables.propagate(e.getCause()); + throw Throwables.propagate(e.getCause()); } } else