Author: markt
Date: Tue Jul 16 22:24:51 2013
New Revision: 1503926
URL: http://svn.apache.org/r1503926
Log:
Unlikely but protect against the lambda expression returning null.
Modified:
tomcat/trunk/java/org/apache/el/stream/Stream.java
Modified: tomcat/trunk/java/org/apache/el/stream/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/stream/Stream.java?rev=1503926&r1=1503925&r2=1503926&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/stream/Stream.java (original)
+++ tomcat/trunk/java/org/apache/el/stream/Stream.java Tue Jul 16 22:24:51 2013
@@ -47,8 +47,8 @@ public class Stream {
protected void findNext() {
while (iterator.hasNext()) {
Object obj = iterator.next();
- if (ELSupport.coerceToBoolean(
- le.invoke(obj)).booleanValue()) {
+ Boolean filter = ELSupport.coerceToBoolean(le.invoke(obj));
+ if (filter != null && filter.booleanValue()) {
next = obj;
foundNext = true;
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
