You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2015/11/01 15:34:19 UTC

svn commit: r1711776 - /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java

Author: schor
Date: Sun Nov  1 14:34:19 2015
New Revision: 1711776

URL: http://svn.apache.org/viewvc?rev=1711776&view=rev
Log:
no jira - remove unneeded null test

Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java?rev=1711776&r1=1711775&r2=1711776&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemUtils.java Sun Nov  1 14:34:19 2015
@@ -248,7 +248,7 @@ public abstract class TypeSystemUtils {
       return false;
     }
     final int len = s.length();
-    if (s == null || len == 0) {
+    if (len == 0) {
       return false;
     }
     int pos = 0;
@@ -385,7 +385,7 @@ public abstract class TypeSystemUtils {
   // Find subtypes that define the feature.  Add subtypes to list.
   private static final void getFeatureDefiningSubtypes(Type type, String fName, List<Type> types) {
     TypeSystem ts = ((TypeImpl) type).getTypeSystem();
-    List<?> subtypes = ts.getDirectSubtypes(type);
+    List<Type> subtypes = ts.getDirectSubtypes(type);
     for (int i = 0; i < subtypes.size(); i++) {
       Type subtype = (Type) subtypes.get(i);
       if (subtype.getFeatureByBaseName(fName) != null) {