svn commit: r528706 - /maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java

[aheritier]

Author: aheritier
Date: Fri Apr 13 16:46:00 2007
New Revision: 528706

URL: http://svn.apache.org/viewvc?view=rev&rev=528706
Log:
New try to fix MAVEN-1840 : java.util.ConcurrentModificationException in Goal
I can't reproduce it locally. Only in continuum

Modified:
    maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java

Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java
URL: 
http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java?view=diff&rev=528706&r1=528705&r2=528706
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java 
(original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java Fri Apr 
13 16:46:00 2007
@@ -239,7 +239,7 @@
     {
         if ( Collections.EMPTY_LIST.equals( this.preGoalCallbacks ) )
         {
-            this.preGoalCallbacks = new ArrayList( 3 );
+            this.preGoalCallbacks = Collections.synchronizedList( new 
ArrayList( 3 ) );
         }
 
         this.preGoalCallbacks.add( callback );
@@ -283,7 +283,7 @@
     {
         if ( Collections.EMPTY_LIST.equals( this.postGoalCallbacks ) )
         {
-            this.postGoalCallbacks = new ArrayList( 3 );
+            this.postGoalCallbacks = Collections.synchronizedList( new 
ArrayList( 3 ) );
         }
 
         this.postGoalCallbacks.add( callback );
@@ -327,7 +327,7 @@
     {
         if ( this.preActionCallbacks.equals( Collections.EMPTY_LIST ) )
         {
-            this.preActionCallbacks = new ArrayList( 3 );
+            this.preActionCallbacks = Collections.synchronizedList( new 
ArrayList( 3 ) );
         }
 
         this.preActionCallbacks.add( callback );
@@ -371,7 +371,7 @@
     {
         if ( this.postActionCallbacks.equals( Collections.EMPTY_LIST ) )
         {
-            this.postActionCallbacks = new ArrayList( 3 );
+            this.postActionCallbacks = Collections.synchronizedList( new 
ArrayList( 3 ) );
         }
 
         this.postActionCallbacks.add( callback );
@@ -431,7 +431,7 @@
     {
         if ( Collections.EMPTY_LIST.equals( this.precursors ) )
         {
-            this.precursors = new ArrayList();
+            this.precursors = Collections.synchronizedList( new ArrayList() );
         }
 
         this.precursors.add( precursor );
@@ -477,7 +477,7 @@
     {
         if ( Collections.EMPTY_LIST.equals( this.postcursors ) )
         {
-            this.postcursors = new ArrayList();
+            this.postcursors = Collections.synchronizedList( new ArrayList() );
         }
 
         this.postcursors.add( postcursor );
@@ -738,12 +738,8 @@
 
         while ( callbackIter.hasNext() )
         {
-            synchronized ( callbackIter )
-            {
-                eachCallback = (PreGoalCallback) callbackIter.next();
-                eachCallback.firePreGoal( this );
-            }
-
+            eachCallback = (PreGoalCallback) callbackIter.next();
+            eachCallback.firePreGoal( this );
         }
 
         // log.info( "end pre-goal callbacks" );