From continuum-commits-return-1666-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Tue Apr 18 13:10:47 2006 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 21672 invoked from network); 18 Apr 2006 13:10:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 Apr 2006 13:10:39 -0000 Received: (qmail 63434 invoked by uid 500); 18 Apr 2006 13:10:33 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 63410 invoked by uid 500); 18 Apr 2006 13:10:33 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 63399 invoked by uid 99); 18 Apr 2006 13:10:33 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Apr 2006 06:10:33 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 18 Apr 2006 06:10:32 -0700 Received: (qmail 21311 invoked by uid 65534); 18 Apr 2006 13:10:01 -0000 Message-ID: <20060418131000.21147.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r394934 - in /maven/continuum/branches/continuum-1.0.x: continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Date: Tue, 18 Apr 2006 13:09:30 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Tue Apr 18 06:09:24 2006 New Revision: 394934 URL: http://svn.apache.org/viewcvs?rev=394934&view=rev Log: Use updateBuildDefinition instead of updateProject in ShellIntegrationTest and fix possible NPE Modified: maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Modified: maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java?rev=394934&r1=394933&r2=394934&view=diff ============================================================================== --- maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java (original) +++ maven/continuum/branches/continuum-1.0.x/continuum-core-it/src/test/java/org/apache/maven/continuum/it/ShellIntegrationTest.java Tue Apr 18 06:09:24 2006 @@ -89,7 +89,7 @@ Project shellProject = continuum.getProjectWithAllDetails( projectId ); bd = (BuildDefinition) shellProject.getBuildDefinitions().iterator().next(); bd.setArguments( "a b" ); - continuum.updateProject( shellProject ); + continuum.updateBuildDefinition( bd, shellProject.getId() ); // TODO: change all details to build details shellProject = continuum.getProjectWithAllDetails( projectId ); Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=394934&r1=394933&r2=394934&view=diff ============================================================================== --- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Tue Apr 18 06:09:24 2006 @@ -1117,7 +1117,23 @@ bd.setArguments( buildDefinition.getArguments() ); - Schedule schedule = getSchedule( buildDefinition.getSchedule().getId() ); + Schedule schedule; + + if ( buildDefinition.getSchedule() == null ) + { + try + { + schedule = store.getScheduleByName( DefaultContinuumInitializer.DEFAULT_SCHEDULE_NAME ); + } + catch ( ContinuumStoreException e ) + { + throw new ContinuumException( "Can't get default schedule.", e ); + } + } + else + { + schedule = getSchedule( buildDefinition.getSchedule().getId() ); + } bd.setSchedule( schedule );