Repository: cassandra Updated Branches: refs/heads/trunk 60eed6346 -> fed476f9c
don't declare throwing exceptions that aren't Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fed476f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fed476f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fed476f9 Branch: refs/heads/trunk Commit: fed476f9c049128674841d1c46b868979352b1a5 Parents: 60eed63 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun Jun 5 20:27:27 2016 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun Jun 5 20:27:27 2016 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/AuthCache.java | 2 +- src/java/org/apache/cassandra/cache/AutoSavingCache.java | 2 +- .../apache/cassandra/cql3/statements/TruncateStatement.java | 2 +- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 6 +++--- .../apache/cassandra/db/compaction/CompactionManager.java | 8 ++++---- .../cassandra/db/compaction/CompactionStrategyManager.java | 2 +- src/java/org/apache/cassandra/db/compaction/Scrubber.java | 4 ++-- src/java/org/apache/cassandra/db/compaction/Verifier.java | 4 ++-- .../org/apache/cassandra/hadoop/cql3/CqlInputFormat.java | 2 +- .../index/sasi/analyzer/filter/StopWordFactory.java | 2 +- .../org/apache/cassandra/io/util/DataOutputStreamPlus.java | 2 +- src/java/org/apache/cassandra/io/util/SafeMemory.java | 2 +- src/java/org/apache/cassandra/repair/RepairJob.java | 4 ++-- src/java/org/apache/cassandra/repair/RepairRunnable.java | 2 +- .../org/apache/cassandra/service/AsyncRepairCallback.java | 2 +- src/java/org/apache/cassandra/service/StartupChecks.java | 4 ++-- src/java/org/apache/cassandra/service/StorageProxy.java | 3 +-- src/java/org/apache/cassandra/service/StorageService.java | 2 +- .../cassandra/streaming/messages/IncomingFileMessage.java | 2 +- .../cassandra/streaming/messages/OutgoingFileMessage.java | 2 +- src/java/org/apache/cassandra/thrift/CassandraServer.java | 4 ---- src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- src/java/org/apache/cassandra/tracing/TraceStateImpl.java | 2 +- 23 files changed, 31 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/auth/AuthCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/AuthCache.java b/src/java/org/apache/cassandra/auth/AuthCache.java index 3e33bbd..0d2a01e 100644 --- a/src/java/org/apache/cassandra/auth/AuthCache.java +++ b/src/java/org/apache/cassandra/auth/AuthCache.java @@ -178,7 +178,7 @@ public class AuthCache<K, V> implements AuthCacheMBean .maximumSize(getMaxEntries()) .build(new CacheLoader<K, V>() { - public V load(K k) throws Exception + public V load(K k) { return loadFunction.apply(k); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/cache/AutoSavingCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java b/src/java/org/apache/cassandra/cache/AutoSavingCache.java index 2921818..1b48d4f 100644 --- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java +++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java @@ -154,7 +154,7 @@ public class AutoSavingCache<K extends CacheKey, V> extends InstrumentingCache<K ListenableFuture<Integer> cacheLoad = es.submit(new Callable<Integer>() { @Override - public Integer call() throws Exception + public Integer call() { return loadSaved(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java b/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java index 66b3da0..336091d 100644 --- a/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java @@ -70,7 +70,7 @@ public class TruncateStatement extends CFStatement implements CQLStatement StorageProxy.truncateBlocking(keyspace(), columnFamily()); } - catch (UnavailableException | TimeoutException | IOException e) + catch (UnavailableException | TimeoutException e) { throw new TruncateException(e); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index f004ae0..a5d27bf 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -279,7 +279,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean logger.trace("scheduling flush in {} ms", period); WrappedRunnable runnable = new WrappedRunnable() { - protected void runMayThrow() throws Exception + protected void runMayThrow() { synchronized (data) { @@ -1205,7 +1205,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean readBarrier.issue(); reclaimExecutor.execute(new WrappedRunnable() { - public void runMayThrow() throws InterruptedException, ExecutionException + public void runMayThrow() { readBarrier.await(); memtable.setDiscarded(); @@ -2232,7 +2232,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean { Callable<LifecycleTransaction> callable = new Callable<LifecycleTransaction>() { - public LifecycleTransaction call() throws Exception + public LifecycleTransaction call() { assert data.getCompacting().isEmpty() : data.getCompacting(); Iterable<SSTableReader> sstables = getPermittedToCompactSSTables(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index dca48aa..51bb6fd 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -409,7 +409,7 @@ public class CompactionManager implements CompactionManagerMBean } @Override - public void execute(LifecycleTransaction txn) throws IOException + public void execute(LifecycleTransaction txn) { AbstractCompactionTask task = cfs.getCompactionStrategyManager().getCompactionTask(txn, NO_GC, Long.MAX_VALUE); task.setUserDefined(true); @@ -515,7 +515,7 @@ public class CompactionManager implements CompactionManagerMBean } @Override - public void execute(LifecycleTransaction txn) throws IOException + public void execute(LifecycleTransaction txn) { logger.debug("Relocating {}", txn.originals()); AbstractCompactionTask task = cfs.getCompactionStrategyManager().getCompactionTask(txn, NO_GC, Long.MAX_VALUE); @@ -673,7 +673,7 @@ public class CompactionManager implements CompactionManagerMBean nonEmptyTasks++; Runnable runnable = new WrappedRunnable() { - protected void runMayThrow() throws IOException + protected void runMayThrow() { task.execute(metrics); } @@ -775,7 +775,7 @@ public class CompactionManager implements CompactionManagerMBean { Runnable runnable = new WrappedRunnable() { - protected void runMayThrow() throws IOException + protected void runMayThrow() { // look up the sstables now that we're on the compaction executor, so we don't try to re-compact // something that was already being compacted earlier. http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java index 51a874b..b6d31d5 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java @@ -701,7 +701,7 @@ public class CompactionStrategyManager implements INotificationConsumer return cfs.runWithCompactionsDisabled(new Callable<Collection<AbstractCompactionTask>>() { @Override - public Collection<AbstractCompactionTask> call() throws Exception + public Collection<AbstractCompactionTask> call() { List<AbstractCompactionTask> tasks = new ArrayList<>(); readLock.lock(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/db/compaction/Scrubber.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/Scrubber.java b/src/java/org/apache/cassandra/db/compaction/Scrubber.java index 01969f5..deda5d8 100644 --- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java +++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java @@ -78,7 +78,7 @@ public class Scrubber implements Closeable }; private final SortedSet<Partition> outOfOrder = new TreeSet<>(partitionComparator); - public Scrubber(ColumnFamilyStore cfs, LifecycleTransaction transaction, boolean skipCorrupted, boolean checkData) throws IOException + public Scrubber(ColumnFamilyStore cfs, LifecycleTransaction transaction, boolean skipCorrupted, boolean checkData) { this(cfs, transaction, skipCorrupted, new OutputHandler.LogOutput(), checkData); } @@ -88,7 +88,7 @@ public class Scrubber implements Closeable LifecycleTransaction transaction, boolean skipCorrupted, OutputHandler outputHandler, - boolean checkData) throws IOException + boolean checkData) { this.cfs = cfs; this.transaction = transaction; http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/db/compaction/Verifier.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/Verifier.java b/src/java/org/apache/cassandra/db/compaction/Verifier.java index bb8bcdb..91c7ad7 100644 --- a/src/java/org/apache/cassandra/db/compaction/Verifier.java +++ b/src/java/org/apache/cassandra/db/compaction/Verifier.java @@ -62,12 +62,12 @@ public class Verifier implements Closeable private final OutputHandler outputHandler; private FileDigestValidator validator; - public Verifier(ColumnFamilyStore cfs, SSTableReader sstable, boolean isOffline) throws IOException + public Verifier(ColumnFamilyStore cfs, SSTableReader sstable, boolean isOffline) { this(cfs, sstable, new OutputHandler.LogOutput(), isOffline); } - public Verifier(ColumnFamilyStore cfs, SSTableReader sstable, OutputHandler outputHandler, boolean isOffline) throws IOException + public Verifier(ColumnFamilyStore cfs, SSTableReader sstable, OutputHandler outputHandler, boolean isOffline) { this.cfs = cfs; this.sstable = sstable; http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java index a426532..daba701 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java @@ -213,7 +213,7 @@ public class CqlInputFormat extends org.apache.hadoop.mapreduce.InputFormat<Long metadata.newToken(partitioner.getTokenFactory().toString(range.right))); } - private Map<TokenRange, Long> getSubSplits(String keyspace, String cfName, TokenRange range, Configuration conf, Session session) throws IOException + private Map<TokenRange, Long> getSubSplits(String keyspace, String cfName, TokenRange range, Configuration conf, Session session) { int splitSize = ConfigHelper.getInputSplitSize(conf); int splitSizeMb = ConfigHelper.getInputSplitSizeInMb(conf); http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StopWordFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StopWordFactory.java b/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StopWordFactory.java index 0492822..8ec02e0 100644 --- a/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StopWordFactory.java +++ b/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StopWordFactory.java @@ -52,7 +52,7 @@ public class StopWordFactory private static final LoadingCache<String, Set<String>> STOP_WORDS_CACHE = CacheBuilder.newBuilder() .build(new CacheLoader<String, Set<String>>() { - public Set<String> load(String s) throws Exception + public Set<String> load(String s) { return getStopWordsFromResource(s); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/io/util/DataOutputStreamPlus.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/DataOutputStreamPlus.java b/src/java/org/apache/cassandra/io/util/DataOutputStreamPlus.java index 755783b..4adb6d2 100644 --- a/src/java/org/apache/cassandra/io/util/DataOutputStreamPlus.java +++ b/src/java/org/apache/cassandra/io/util/DataOutputStreamPlus.java @@ -87,7 +87,7 @@ public abstract class DataOutputStreamPlus extends OutputStream implements DataO } @Override - public void close() throws IOException + public void close() { } http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/io/util/SafeMemory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/SafeMemory.java b/src/java/org/apache/cassandra/io/util/SafeMemory.java index e8cd54f..4482d96 100644 --- a/src/java/org/apache/cassandra/io/util/SafeMemory.java +++ b/src/java/org/apache/cassandra/io/util/SafeMemory.java @@ -84,7 +84,7 @@ public class SafeMemory extends Memory implements SharedCloseable this.size = size; } - public void tidy() throws Exception + public void tidy() { /** see {@link Memory#Memory(long)} re: null pointers*/ if (peer != 0) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/repair/RepairJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/repair/RepairJob.java b/src/java/org/apache/cassandra/repair/RepairJob.java index cba176c..454865b 100644 --- a/src/java/org/apache/cassandra/repair/RepairJob.java +++ b/src/java/org/apache/cassandra/repair/RepairJob.java @@ -85,7 +85,7 @@ public class RepairJob extends AbstractFuture<RepairResult> implements Runnable ListenableFuture<List<InetAddress>> allSnapshotTasks = Futures.allAsList(snapshotTasks); validations = Futures.transform(allSnapshotTasks, new AsyncFunction<List<InetAddress>, List<TreeResponse>>() { - public ListenableFuture<List<TreeResponse>> apply(List<InetAddress> endpoints) throws Exception + public ListenableFuture<List<TreeResponse>> apply(List<InetAddress> endpoints) { if (parallelismDegree == RepairParallelism.SEQUENTIAL) return sendSequentialValidationRequest(endpoints); @@ -103,7 +103,7 @@ public class RepairJob extends AbstractFuture<RepairResult> implements Runnable // When all validations complete, submit sync tasks ListenableFuture<List<SyncStat>> syncResults = Futures.transform(validations, new AsyncFunction<List<TreeResponse>, List<SyncStat>>() { - public ListenableFuture<List<SyncStat>> apply(List<TreeResponse> trees) throws Exception + public ListenableFuture<List<SyncStat>> apply(List<TreeResponse> trees) { InetAddress local = FBUtilities.getLocalAddress(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/repair/RepairRunnable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/repair/RepairRunnable.java b/src/java/org/apache/cassandra/repair/RepairRunnable.java index 26c9f5a..7c5b2f1 100644 --- a/src/java/org/apache/cassandra/repair/RepairRunnable.java +++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java @@ -271,7 +271,7 @@ public class RepairRunnable extends WrappedRunnable implements ProgressEventNoti ListenableFuture anticompactionResult = Futures.transform(allSessions, new AsyncFunction<List<RepairSessionResult>, Object>() { @SuppressWarnings("unchecked") - public ListenableFuture apply(List<RepairSessionResult> results) throws Exception + public ListenableFuture apply(List<RepairSessionResult> results) { // filter out null(=failed) results and get successful ranges for (RepairSessionResult sessionResult : results) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/service/AsyncRepairCallback.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/AsyncRepairCallback.java b/src/java/org/apache/cassandra/service/AsyncRepairCallback.java index dec5319..4e70d56 100644 --- a/src/java/org/apache/cassandra/service/AsyncRepairCallback.java +++ b/src/java/org/apache/cassandra/service/AsyncRepairCallback.java @@ -46,7 +46,7 @@ public class AsyncRepairCallback implements IAsyncCallback<ReadResponse> { StageManager.getStage(Stage.READ_REPAIR).execute(new WrappedRunnable() { - protected void runMayThrow() throws DigestMismatchException, IOException + protected void runMayThrow() { repairResolver.resolve(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/service/StartupChecks.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java index d837921..3291fbf 100644 --- a/src/java/org/apache/cassandra/service/StartupChecks.java +++ b/src/java/org/apache/cassandra/service/StartupChecks.java @@ -114,7 +114,7 @@ public class StartupChecks public static final StartupCheck checkJemalloc = new StartupCheck() { - public void execute() throws StartupException + public void execute() { if (FBUtilities.isWindows()) return; @@ -258,7 +258,7 @@ public class StartupChecks FileVisitor<Path> sstableVisitor = new SimpleFileVisitor<Path>() { - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { if (!Descriptor.isValidFile(file.getFileName().toString())) return FileVisitResult.CONTINUE; http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index b917cf1..8ae5043 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -2362,9 +2362,8 @@ public class StorageProxy implements StorageProxyMBean * @param cfname * @throws UnavailableException If some of the hosts in the ring are down. * @throws TimeoutException - * @throws IOException */ - public static void truncateBlocking(String keyspace, String cfname) throws UnavailableException, TimeoutException, IOException + public static void truncateBlocking(String keyspace, String cfname) throws UnavailableException, TimeoutException { logger.debug("Starting a blocking truncate operation on keyspace {}, CF {}", keyspace, cfname); if (isAnyStorageHostDown()) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 2ac7ad6..d7deb8e 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -2670,7 +2670,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE } // TODO - public final void deliverHints(String host) throws UnknownHostException + public final void deliverHints(String host) { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java index d881d43..b828dc4 100644 --- a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java +++ b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java @@ -72,7 +72,7 @@ public class IncomingFileMessage extends StreamMessage } } - public void serialize(IncomingFileMessage message, DataOutputStreamPlus out, int version, StreamSession session) throws IOException + public void serialize(IncomingFileMessage message, DataOutputStreamPlus out, int version, StreamSession session) { throw new UnsupportedOperationException("Not allowed to call serialize on an incoming file"); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java index f10b42e..9530e14 100644 --- a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java +++ b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java @@ -38,7 +38,7 @@ public class OutgoingFileMessage extends StreamMessage { public static Serializer<OutgoingFileMessage> serializer = new Serializer<OutgoingFileMessage>() { - public OutgoingFileMessage deserialize(ReadableByteChannel in, int version, StreamSession session) throws IOException + public OutgoingFileMessage deserialize(ReadableByteChannel in, int version, StreamSession session) { throw new UnsupportedOperationException("Not allowed to call deserialize on an outgoing file"); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java index 357958c..a189000 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -2110,10 +2110,6 @@ public class CassandraServer implements Cassandra.Iface { throw new TimedOutException(); } - catch (IOException e) - { - throw (UnavailableException) new UnavailableException().initCause(e); - } finally { Tracing.instance.stopSession(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index 7775178..36c74de 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -226,7 +226,7 @@ public class NodeProbe implements AutoCloseable mbeanServerConn, ManagementFactory.RUNTIME_MXBEAN_NAME, RuntimeMXBean.class); } - private RMIClientSocketFactory getRMIClientSocketFactory() throws IOException + private RMIClientSocketFactory getRMIClientSocketFactory() { if (Boolean.parseBoolean(System.getProperty("ssl.enable"))) return new SslRMIClientSocketFactory(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/fed476f9/src/java/org/apache/cassandra/tracing/TraceStateImpl.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tracing/TraceStateImpl.java b/src/java/org/apache/cassandra/tracing/TraceStateImpl.java index 1bc210a..113ebb7 100644 --- a/src/java/org/apache/cassandra/tracing/TraceStateImpl.java +++ b/src/java/org/apache/cassandra/tracing/TraceStateImpl.java @@ -52,7 +52,7 @@ public class TraceStateImpl extends TraceState { StageManager.getStage(Stage.TRACING).execute(new WrappedRunnable() { - protected void runMayThrow() throws Exception + protected void runMayThrow() { mutateWithCatch(mutation); }
