Marica?
On 22/08/2009, at 10:28 PM, Brett Porter wrote:
On 10/08/2009, at 3:25 AM, c...@apache.org 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
