Author: cwiklik
Date: Mon Feb 13 20:20:57 2017
New Revision: 1782853
URL: http://svn.apache.org/viewvc?rev=1782853&view=rev
Log:
UIMA-5308 fixed potential NPE and also a logic problem replacing && with ||
Modified:
uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
Modified:
uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java?rev=1782853&r1=1782852&r2=1782853&view=diff
==============================================================================
---
uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
(original)
+++
uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
Mon Feb 13 20:20:57 2017
@@ -1000,7 +1000,7 @@ public Object getLastCas() {
}
if ((filterExpression.getOperand() == null
- && filterExpression.getOperand().getOperand() == null &&
!exists)
+ || filterExpression.getOperand().getOperand() == null ||
!exists)
|| // this means that the feature must exist in CAS
("!".equals(filterExpression.getOperand().getOperand()) &&
exists)) // this
// means
