commit dfbc351833b2669e2bec421c6a7b4279f6c669f5
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 12 23:53:31 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 12 23:53:31 2019 +0000
tree 4477ca497e619f5c766d6c9a0b933cb91789d24c
parent 994fbad39662540cc2ac1ccc1f3f98e6f942cdfa
parent 2e5bf556609c51ad4244827f5849dd9185ce5d7a

Propagate exception to error code am: 2e5bf55660

Change-Id: Ib88c4187e10662b3a2663d6facb067f43f65f3cd

common/jacoco/src/main/java/com/google/android/jacoco/reporter/ReportGenerator.java

diff --git a/common/jacoco/src/main/java/com/google/android/jacoco/reporter/ReportGenerator.java b/common/jacoco/src/main/java/com/google/android/jacoco/reporter/ReportGenerator.java
index c428f14..417638a 100644
--- a/common/jacoco/src/main/java/com/google/android/jacoco/reporter/ReportGenerator.java
+++ b/common/jacoco/src/main/java/com/google/android/jacoco/reporter/ReportGenerator.java
@@ -55,23 +55,19 @@
         mConfig = config;
     }
 
-    private void execute() {
+    private void execute() throws IOException {
         ExecFileLoader execFileLoader = new ExecFileLoader();
-        try {
-            execFileLoader.load(mConfig.mExecFileDir);
-            IReportVisitor reportVisitor = new MultiReportVisitor(getVisitors());
-            reportVisitor.visitInfo(execFileLoader.getSessionInfoStore().getInfos(),
-                    execFileLoader.getExecutionDataStore().getContents());
-            MultiSourceFileLocator sourceFileLocator = new MultiSourceFileLocator(TAB_WIDTH);
-            mConfig.mSourceDirs.stream().filter(File::isDirectory)
-                    .map(sourceDir -> new DirectorySourceFileLocator(sourceDir, null, TAB_WIDTH))
-                    .forEach(sourceFileLocator::add);
-            reportVisitor.visitBundle(createBundle(execFileLoader.getExecutionDataStore()),
-                    sourceFileLocator);
-            reportVisitor.visitEnd();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        execFileLoader.load(mConfig.mExecFileDir);
+        IReportVisitor reportVisitor = new MultiReportVisitor(getVisitors());
+        reportVisitor.visitInfo(execFileLoader.getSessionInfoStore().getInfos(),
+                execFileLoader.getExecutionDataStore().getContents());
+        MultiSourceFileLocator sourceFileLocator = new MultiSourceFileLocator(TAB_WIDTH);
+        mConfig.mSourceDirs.stream().filter(File::isDirectory)
+                .map(sourceDir -> new DirectorySourceFileLocator(sourceDir, null, TAB_WIDTH))
+                .forEach(sourceFileLocator::add);
+        reportVisitor.visitBundle(createBundle(execFileLoader.getExecutionDataStore()),
+                sourceFileLocator);
+        reportVisitor.visitEnd();
     }
 
     private IBundleCoverage createBundle(ExecutionDataStore dataStore) throws IOException {
@@ -97,7 +93,7 @@
         return coverageBuilder.getBundle(mConfig.mReportName);
     }
 
-    private List<IReportVisitor> getVisitors() throws Exception {
+    private List<IReportVisitor> getVisitors() throws IOException {
         List<IReportVisitor> visitors = new ArrayList<>();
         visitors.add(new XMLFormatter().createVisitor(mConfig.getXmlOutputStream()));
         visitors.add(new HTMLFormatter().createVisitor(mConfig.getHtmlReportOutput()));
@@ -196,6 +192,9 @@
         } catch (ParseException e) {
             printHelp(e, options);
             System.exit(1);
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.exit(1);
         }
     }
 }