You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/07/15 15:44:58 UTC
svn commit: r964427 -
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/phase/PhaseListenerExtension.java
Author: gpetracek
Date: Thu Jul 15 13:44:57 2010
New Revision: 964427
URL: http://svn.apache.org/viewvc?rev=964427&view=rev
Log:
EXTCDI-10 cleanup
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/phase/PhaseListenerExtension.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/phase/PhaseListenerExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/phase/PhaseListenerExtension.java?rev=964427&r1=964426&r2=964427&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/phase/PhaseListenerExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/phase/PhaseListenerExtension.java Thu Jul 15 13:44:57 2010
@@ -28,6 +28,7 @@ import javax.enterprise.inject.spi.Proce
import javax.faces.event.PhaseListener;
import java.util.List;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.concurrent.CopyOnWriteArrayList;
/**
@@ -71,9 +72,14 @@ public class PhaseListenerExtension impl
//current workaround some servers
public static List<PhaseListener> consumePhaseListeners()
{
- List<PhaseListener> result = new ArrayList<PhaseListener>(phaseListeners.size());
- result.addAll(phaseListeners);
- phaseListeners.clear();
- return result;
+ int phaseListenerListSize = phaseListeners.size();
+ if(phaseListenerListSize > 0)
+ {
+ List<PhaseListener> result = new ArrayList<PhaseListener>(phaseListenerListSize);
+ result.addAll(phaseListeners);
+ phaseListeners.clear();
+ return result;
+ }
+ return Collections.emptyList();
}
}