[tor-commits] [collector/master] Collapse identical catch blocks.

karsten at torproject.org karsten at torproject.org
Mon Aug 27 12:34:22 UTC 2018


commit bc83cc6450cce9bed6f23b7bdee19b9c7d113d84
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Mon Aug 20 15:36:00 2018 +0200

    Collapse identical catch blocks.
---
 .../metrics/collector/relaydescs/CachedRelayDescriptorReader.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java
index 737344b..1a8922b 100644
--- a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java
+++ b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java
@@ -220,10 +220,7 @@ public class CachedRelayDescriptorReader {
                 + (f.getName().startsWith("cached-descriptors")
                 ? "server" : "extra-info") + " descriptors");
           }
-        } catch (IOException e) {
-          logger.warn("Failed reading "
-              + cachedDescDir.getAbsolutePath() + " directory.", e);
-        } catch (ParseException e) {
+        } catch (IOException | ParseException e) {
           logger.warn("Failed reading "
               + cachedDescDir.getAbsolutePath() + " directory.", e);
         }





More information about the tor-commits mailing list