|
»
»
Re: svn commit: r802673
|
View:
New views
5 Messages
—
Rating Filter:
Alert me
|
 |
|
|
|
Re: svn commit: r802673
by brettporter
::
Rate this Message:
Marica?
On 22/08/2009, at 10:28 PM, Brett Porter wrote: > > On 10/08/2009, at 3:25 AM, ctan@... wrote: > >> Author: ctan >> Date: Mon Aug 10 07:25:33 2009 >> New Revision: 802673 >> >> URL: http://svn.apache.org/viewvc?rev=802673&view=rev >> Log: >> [CONTINUUM-2320] prevent NPE in build agent task queue manager >> >> Modified: >> continuum/branches/continuum-1.3.x/continuum-buildagent/continuum- >> buildagent-core/src/main/java/org/apache/continuum/buildagent/ >> taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >> >> Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/ >> continuum-buildagent-core/src/main/java/org/apache/continuum/ >> buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >> URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java?rev=802673&r1=802672&r2=802673&view=diff >> = >> = >> = >> = >> = >> = >> = >> = >> = >> ===================================================================== >> --- continuum/branches/continuum-1.3.x/continuum-buildagent/ >> continuum-buildagent-core/src/main/java/org/apache/continuum/ >> buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >> (original) >> +++ continuum/branches/continuum-1.3.x/continuum-buildagent/ >> continuum-buildagent-core/src/main/java/org/apache/continuum/ >> buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >> Mon Aug 10 07:25:33 2009 >> @@ -116,8 +116,11 @@ >> { >> for ( BuildProjectTask task : queues ) >> { >> - log.info( "remove project '" + >> task.getProjectName() + "' from build queue" ); >> - buildAgentBuildQueue.remove( task ); >> + if ( task != null ) >> + { >> + log.info( "remove project '" + >> task.getProjectName() + "' from build queue" ); >> + buildAgentBuildQueue.remove( task ); >> + } > > > Would it be better to prevent the insertion of a null task into the > queue instead? This seems like it might hide an error on the other > end. > > - Brett > |
|
|
Re: svn commit: r802673
by Marica Tan-2
::
Rate this Message:
On Fri, Aug 28, 2009 at 3:14 PM, Brett Porter <brett@...> wrote:
> Marica? > > > On 22/08/2009, at 10:28 PM, Brett Porter wrote: > > >> On 10/08/2009, at 3:25 AM, ctan@... wrote: >> >> Author: ctan >>> Date: Mon Aug 10 07:25:33 2009 >>> New Revision: 802673 >>> >>> URL: http://svn.apache.org/viewvc?rev=802673&view=rev >>> Log: >>> [CONTINUUM-2320] prevent NPE in build agent task queue manager >>> >>> Modified: >>> >>> continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >>> >>> Modified: >>> continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >>> URL: >>> http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java?rev=802673&r1=802672&r2=802673&view=diff >>> >>> ============================================================================== >>> --- >>> continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >>> (original) >>> +++ >>> continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >>> Mon Aug 10 07:25:33 2009 >>> @@ -116,8 +116,11 @@ >>> { >>> for ( BuildProjectTask task : queues ) >>> { >>> - log.info( "remove project '" + >>> task.getProjectName() + "' from build queue" ); >>> - buildAgentBuildQueue.remove( task ); >>> + if ( task != null ) >>> + { >>> + log.info( "remove project '" + >>> task.getProjectName() + "' from build queue" ); >>> + buildAgentBuildQueue.remove( task ); >>> + } >>> >> >> >> Would it be better to prevent the insertion of a null task into the queue >> instead? This seems like it might hide an error on the other end. >> > the queue >> - Brett >> >> > |
|
|
Re: svn commit: r802673
by brettporter
::
Rate this Message:
Ping? :)
On 28/08/2009, at 5:14 PM, Brett Porter wrote: > Marica? > > On 22/08/2009, at 10:28 PM, Brett Porter wrote: > >> >> On 10/08/2009, at 3:25 AM, ctan@... wrote: >> >>> Author: ctan >>> Date: Mon Aug 10 07:25:33 2009 >>> New Revision: 802673 >>> >>> URL: http://svn.apache.org/viewvc?rev=802673&view=rev >>> Log: >>> [CONTINUUM-2320] prevent NPE in build agent task queue manager >>> >>> Modified: >>> continuum/branches/continuum-1.3.x/continuum-buildagent/continuum- >>> buildagent-core/src/main/java/org/apache/continuum/buildagent/ >>> taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >>> >>> Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/ >>> continuum-buildagent-core/src/main/java/org/apache/continuum/ >>> buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >>> URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java?rev=802673&r1=802672&r2=802673&view=diff >>> = >>> = >>> = >>> = >>> = >>> = >>> = >>> = >>> = >>> = >>> ==================================================================== >>> --- continuum/branches/continuum-1.3.x/continuum-buildagent/ >>> continuum-buildagent-core/src/main/java/org/apache/continuum/ >>> buildagent/taskqueue/manager/ >>> DefaultBuildAgentTaskQueueManager.java (original) >>> +++ continuum/branches/continuum-1.3.x/continuum-buildagent/ >>> continuum-buildagent-core/src/main/java/org/apache/continuum/ >>> buildagent/taskqueue/manager/ >>> DefaultBuildAgentTaskQueueManager.java Mon Aug 10 07:25:33 2009 >>> @@ -116,8 +116,11 @@ >>> { >>> for ( BuildProjectTask task : queues ) >>> { >>> - log.info( "remove project '" + >>> task.getProjectName() + "' from build queue" ); >>> - buildAgentBuildQueue.remove( task ); >>> + if ( task != null ) >>> + { >>> + log.info( "remove project '" + >>> task.getProjectName() + "' from build queue" ); >>> + buildAgentBuildQueue.remove( task ); >>> + } >> >> >> Would it be better to prevent the insertion of a null task into the >> queue instead? This seems like it might hide an error on the other >> end. >> >> - Brett >> > |
|
|
Re: svn commit: r802673
by Marica Tan-2
::
Rate this Message:
Hi Brett,
I added the check above just in case the build queue has a null task. But I reviewed the code and it seems it's not possible to insert a null task in the queue. I can remove the checking for null if you want. org.apache.continuum.buildagent.action.CreateBuildProjectTaskAction @ line 66 Thanks, -- Marica On Mon, Sep 14, 2009 at 4:06 PM, Brett Porter <brett@...> wrote: > Ping? :) > > > On 28/08/2009, at 5:14 PM, Brett Porter wrote: > > Marica? >> >> On 22/08/2009, at 10:28 PM, Brett Porter wrote: >> >> >>> On 10/08/2009, at 3:25 AM, ctan@... wrote: >>> >>> Author: ctan >>>> Date: Mon Aug 10 07:25:33 2009 >>>> New Revision: 802673 >>>> >>>> URL: http://svn.apache.org/viewvc?rev=802673&view=rev >>>> Log: >>>> [CONTINUUM-2320] prevent NPE in build agent task queue manager >>>> >>>> Modified: >>>> >>>> continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >>>> >>>> Modified: >>>> continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >>>> URL: >>>> http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java?rev=802673&r1=802672&r2=802673&view=diff >>>> >>>> ============================================================================== >>>> --- >>>> continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >>>> (original) >>>> +++ >>>> continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java >>>> Mon Aug 10 07:25:33 2009 >>>> @@ -116,8 +116,11 @@ >>>> { >>>> for ( BuildProjectTask task : queues ) >>>> { >>>> - log.info( "remove project '" + >>>> task.getProjectName() + "' from build queue" ); >>>> - buildAgentBuildQueue.remove( task ); >>>> + if ( task != null ) >>>> + { >>>> + log.info( "remove project '" + >>>> task.getProjectName() + "' from build queue" ); >>>> + buildAgentBuildQueue.remove( task ); >>>> + } >>>> >>> >>> >>> Would it be better to prevent the insertion of a null task into the queue >>> instead? This seems like it might hide an error on the other end. >>> >>> - Brett >>> >>> >> > |
| Free embeddable forum powered by Nabble | Forum Help |
