Return-Path: Delivered-To: apmail-continuum-dev-archive@www.apache.org Received: (qmail 20993 invoked from network); 20 Apr 2009 07:21:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Apr 2009 07:21:38 -0000 Received: (qmail 47324 invoked by uid 500); 20 Apr 2009 07:21:38 -0000 Delivered-To: apmail-continuum-dev-archive@continuum.apache.org Received: (qmail 47247 invoked by uid 500); 20 Apr 2009 07:21:38 -0000 Mailing-List: contact dev-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list dev@continuum.apache.org Received: (qmail 47237 invoked by uid 99); 20 Apr 2009 07:21:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2009 07:21:38 +0000 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [61.9.189.140] (HELO nschwmtas02p.mx.bigpond.com) (61.9.189.140) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2009 07:21:28 +0000 Received: from nschwotgx03p.mx.bigpond.com ([124.179.8.45]) by nschwmtas02p.mx.bigpond.com with ESMTP id <20090420072104.RXDK20136.nschwmtas02p.mx.bigpond.com@nschwotgx03p.mx.bigpond.com> for ; Mon, 20 Apr 2009 07:21:04 +0000 Received: from [10.0.0.1] (really [124.179.8.45]) by nschwotgx03p.mx.bigpond.com with ESMTP id <20090420072103.QZEF12625.nschwotgx03p.mx.bigpond.com@[10.0.0.1]> for ; Mon, 20 Apr 2009 07:21:03 +0000 Message-Id: From: Brett Porter To: dev@continuum.apache.org In-Reply-To: <20090420070338.5AE6C238893B@eris.apache.org> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v930.3) Subject: Re: svn commit: r766597 - in /continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action: CancelBuildAction.java ScheduleAction.java Date: Mon, 20 Apr 2009 17:21:02 +1000 References: <20090420070338.5AE6C238893B@eris.apache.org> X-Mailer: Apple Mail (2.930.3) X-RPD-ScanID: Class unknown; VirusThreatLevel unknown, RefID str=0001.0A150202.49EC2260.0088,ss=1,fgs=0 X-Virus-Checked: Checked by ClamAV on apache.org On 20/04/2009, at 5:03 PM, jzurbano@apache.org wrote: > Author: jzurbano > Date: Mon Apr 20 07:03:37 2009 > New Revision: 766597 > > URL: http://svn.apache.org/viewvc?rev=766597&view=rev > Log: > removed duplicate execution This seems like two different commits... and should they be attached to a JIRA issue? > > Modified: > continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/ > continuum/web/action/CancelBuildAction.java > continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/ > continuum/web/action/ScheduleAction.java > > Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/ > maven/continuum/web/action/CancelBuildAction.java > URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java?rev=766597&r1=766596&r2=766597&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/ > continuum/web/action/CancelBuildAction.java (original) > +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/ > continuum/web/action/CancelBuildAction.java Mon Apr 20 07:03:37 2009 > @@ -109,10 +109,8 @@ > int index = ArrayUtils.indexOf( projectsId, > getCurrentProjectIdBuilding() ); > if ( index > 0 ) > { > - > getContinuum().getBuildsManager().cancelBuild( projectsId[index] ); > - > int projId = projectsId[index]; > - > getContinuum().getBuildsManager().cancelBuild( projectsId[index] ); > + > getContinuum().getBuildsManager().cancelBuild( projId ); > > AuditLog event = new AuditLog( "Project id=" + > projId, AuditLogConstants.CANCEL_BUILD ); > event.setCategory( AuditLogConstants.PROJECT ); > > Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/ > maven/continuum/web/action/ScheduleAction.java > URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=766597&r1=766596&r2=766597&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/ > continuum/web/action/ScheduleAction.java (original) > +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/ > continuum/web/action/ScheduleAction.java Mon Apr 20 07:03:37 2009 > @@ -240,15 +240,16 @@ > logger.debug( "Unexpected error getting schedule" ); > } > } > - AuditLog event = null; > + > + AuditLog event = new AuditLog( getName(), > AuditLogConstants.ADD_SCHEDULE ); > + event.setCategory( AuditLogConstants.SCHEDULE ); > + event.setCurrentUser( getPrincipal() ); > + > if ( id == 0 ) > { > try > { > getContinuum().addSchedule( setFields( new > Schedule() ) ); > - event = new AuditLog( getName(), > AuditLogConstants.ADD_SCHEDULE ); > - event.setCategory( AuditLogConstants.SCHEDULE ); > - event.setCurrentUser( getPrincipal() ); > event.log(); > } > catch ( ContinuumException e ) > @@ -263,9 +264,7 @@ > try > { > > getContinuum > ().updateSchedule( setFields( getContinuum().getSchedule( id ) ) ); > - event = new AuditLog( getName(), > AuditLogConstants.MODIFY_SCHEDULE ); > - event.setCategory( AuditLogConstants.SCHEDULE ); > - event.setCurrentUser( getPrincipal() ); > + event.setAction( AuditLogConstants.MODIFY_SCHEDULE ); > event.log(); > } > catch ( ContinuumException e ) > >