Skip to content

Commit 181d173

Browse files
committed
Ignoring exception is a bad idea
1 parent 5ef67b4 commit 181d173

File tree

1 file changed

+19
-30
lines changed

1 file changed

+19
-30
lines changed

maven-plugin/src/main/java/hudson/maven/Maven3Builder.java

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,6 @@ public void mojoSucceeded( ExecutionEvent event ) {
494494
}
495495

496496
private void recordMojoSucceeded(ExecutionEvent event) {
497-
Long startTime = getMojoStartTime( event.getProject() );
498-
Date endTime = new Date();
499497
MavenProject mavenProject = event.getProject();
500498
XmlPlexusConfiguration xmlPlexusConfiguration = new XmlPlexusConfiguration( event.getMojoExecution().getConfiguration() );
501499

@@ -505,18 +503,8 @@ private void recordMojoSucceeded(ExecutionEvent event) {
505503
new MojoInfo( event.getMojoExecution(), mojo, xmlPlexusConfiguration,
506504
getExpressionEvaluator( event.getSession(), event.getMojoExecution() ) );
507505

508-
try {
509-
ExecutedMojo executedMojo =
510-
new ExecutedMojo( mojoInfo, startTime == null ? 0 : endTime.getTime() - startTime.longValue() );
511-
this.executedMojosPerModule.get( new ModuleName( mavenProject.getGroupId(),
512-
mavenProject.getArtifactId() ) ).add( executedMojo );
513-
514-
} catch ( Exception e ) {
515-
// ignoring this
516-
maven3Builder.listener.getLogger().println( "ignoring exception during new ExecutedMojo "
517-
+ e.getMessage() );
518-
}
519-
506+
recordExecutionTime(event,mojoInfo);
507+
520508
List<MavenReporter> mavenReporters = getMavenReporters( mavenProject );
521509

522510
MavenBuildProxy2 mavenBuildProxy2 = getMavenBuildProxy2( mavenProject );
@@ -529,13 +517,25 @@ private void recordMojoSucceeded(ExecutionEvent event) {
529517
mavenReporter.postExecute( mavenBuildProxy2, mavenProject, mojoInfo, maven3Builder.listener, getExecutionException(event));
530518
} catch ( InterruptedException e ) {
531519
e.printStackTrace();
532-
}
533-
catch ( IOException e ) {
520+
} catch ( IOException e ) {
534521
e.printStackTrace();
535522
}
536523
}
537524
}
538-
}
525+
}
526+
527+
/**
528+
* Record how long it took to run this mojo.
529+
*/
530+
private void recordExecutionTime(ExecutionEvent event, MojoInfo mojoInfo) {
531+
MavenProject p = event.getProject();
532+
List<ExecutedMojo> m = executedMojosPerModule.get(new ModuleName(p));
533+
if (m==null) // defensive check
534+
executedMojosPerModule.put(new ModuleName(p), m=new CopyOnWriteArrayList<ExecutedMojo>());
535+
536+
Long startTime = getMojoStartTime( event.getProject() );
537+
m.add(new ExecutedMojo( mojoInfo, startTime == null ? 0 : new Date().getTime() - startTime ));
538+
}
539539

540540
/**
541541
* @see org.apache.maven.execution.ExecutionListener#mojoFailed(org.apache.maven.execution.ExecutionEvent)
@@ -556,8 +556,6 @@ private void debug(String msg) {
556556
}
557557

558558
private void recordMojoFailed(ExecutionEvent event) {
559-
Long startTime = getMojoStartTime( event.getProject() );
560-
Date endTime = new Date();
561559
MavenProject mavenProject = event.getProject();
562560
XmlPlexusConfiguration xmlPlexusConfiguration = new XmlPlexusConfiguration( event.getMojoExecution().getConfiguration() );
563561

@@ -567,17 +565,8 @@ private void recordMojoFailed(ExecutionEvent event) {
567565
new MojoInfo( event.getMojoExecution(), mojo, xmlPlexusConfiguration,
568566
getExpressionEvaluator( event.getSession(), event.getMojoExecution() ) );
569567

570-
try {
571-
ExecutedMojo executedMojo =
572-
new ExecutedMojo( mojoInfo, startTime == null ? 0 : endTime.getTime() - startTime.longValue() );
573-
this.executedMojosPerModule.get( new ModuleName( mavenProject.getGroupId(),
574-
mavenProject.getArtifactId() ) ).add( executedMojo );
575-
} catch ( Exception e ) {
576-
// ignoring this
577-
maven3Builder.listener.getLogger().println( "ignoring exception during new ExecutedMojo "
578-
+ e.getMessage() );
579-
}
580-
568+
recordExecutionTime(event,mojoInfo);
569+
581570
List<MavenReporter> mavenReporters = getMavenReporters( mavenProject );
582571

583572
MavenBuildProxy2 mavenBuildProxy2 = getMavenBuildProxy2( mavenProject );

0 commit comments

Comments
 (0)