You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by em...@apache.org on 2018/01/25 14:16:46 UTC
svn commit: r1822205 -
/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/model/IterableDataModel.java
Author: embreijo
Date: Thu Jan 25 14:16:46 2018
New Revision: 1822205
URL: http://svn.apache.org/viewvc?rev=1822205&view=rev
Log:
MYFACES-4195 Unexpected NullPointerException thrown in IterableDataModel
Modified:
myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/model/IterableDataModel.java
Modified: myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/model/IterableDataModel.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/model/IterableDataModel.java?rev=1822205&r1=1822204&r2=1822205&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/model/IterableDataModel.java (original)
+++ myfaces/core/branches/2.3.x/api/src/main/java/javax/faces/model/IterableDataModel.java Thu Jan 25 14:16:46 2018
@@ -106,11 +106,11 @@ public class IterableDataModel<E> extend
{
_list = new ArrayList<E>();
}
- if (_iterator == null)
+ if (_iterator == null && _iterable != null)
{
_iterator = _iterable.iterator();
}
- if (_iterator.hasNext())
+ if (_iterator != null && _iterator.hasNext())
{
_list.add(_iterator.next());
}