svn commit: r1748678 - in /uima/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/RutaStream.java test/java/org/apache/uima/ruta/NullExpressionTest.java test/java/org/apache/uima/ruta/expression/NullExpressionTest.java

[pkluegl]

Author: pkluegl
Date: Thu Jun 16 10:07:50 2016
New Revision: 1748678

URL: http://svn.apache.org/viewvc?rev=1748678&view=rev
Log:
no jira - allow assignment of null to annotation features

Added:
    
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/NullExpressionTest.java
      - copied, changed from r1733239, 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java
Removed:
    
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java
Modified:
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java?rev=1748678&r1=1748677&r2=1748678&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java 
(original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java 
Thu Jun 16 10:07:50 2016
@@ -1058,7 +1058,6 @@ public class RutaStream extends FSIterat
     } else if (value instanceof IAnnotationExpression && 
!feature.getRange().isPrimitive()) {
       IAnnotationExpression ae = (IAnnotationExpression) value;
       AnnotationFS a = ae.getAnnotation(context, this);
-      if (a != null) {
         // TODO support annotation list expressions
         if (feature.getRange().isArray()) {
           List<AnnotationFS> c = new ArrayList<AnnotationFS>();
@@ -1067,7 +1066,6 @@ public class RutaStream extends FSIterat
         } else {
           annotation.setFeatureValue(feature, a);
         }
-      }
     } else if (value instanceof IAnnotationListExpression && 
!feature.getRange().isPrimitive()) {
       IAnnotationListExpression ale = (IAnnotationListExpression) value;
       List<AnnotationFS> annotations = ale.getAnnotationList(context, this);

Copied: 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/NullExpressionTest.java
 (from r1733239, 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java)
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/NullExpressionTest.java?p2=uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/NullExpressionTest.java&p1=uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java&r1=1733239&r2=1748678&rev=1748678&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/NullExpressionTest.java
 Thu Jun 16 10:07:50 2016
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.ruta;
+package org.apache.uima.ruta.expression;
 
 import java.util.ArrayList;
 import java.util.List;