[fix] handle multiple entries on the knownapitypes feature line.

1 files changed, 9 insertions, 1 deletions

diff --git a/tools/codegenerator/Helper.groovy b/tools/codegenerator/Helper.groovy
index ff619355ef..737eeee597 100644
--- a/tools/codegenerator/Helper.groovy
+++ b/tools/codegenerator/Helper.groovy
@@ -678,10 +678,14 @@ public class Helper
    {
      String rootType = SwigTypeParser.getRootType(type)
      String namespace = findNamespace(searchFrom,'::',false)
-     return hasFeatureSetting(type,searchFrom,'feature_knownapitypes',{ it.split(',').find(
+     String lastMatch = null
+     hasFeatureSetting(type,searchFrom,'feature_knownapitypes',{ it.split(',').find(
        { 
          if (it.trim() == rootType)
+         {
+           lastMatch = rootType
            return true
+         }
          // we assume the 'type' is defined within namespace and 
          //  so we can walk up the namespace appending the type until 
          //  we find a match.
@@ -689,13 +693,17 @@ public class Helper
          {
 //           System.out.println('checking ' + (namespace + '::' + rootType))
            if ((namespace + '::' + rootType) == it.trim())
+           {
+             lastMatch = it.trim()
              return true
+           }
            // truncate the last namespace
            int chop = namespace.lastIndexOf('::')
            namespace = (chop > 0) ? namespace.substring(0,chop) : ''
          }
          return false
        }) != null })
+     return lastMatch
    }
 
    private static String hasFeatureSetting(String type, Node searchFrom, String feature, Closure test)