Code gen fixes for filters

Author: steve

code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryXmlSubObjectSource.vm

@@ -66,25 +66,27 @@ void ${typeInfo.className}::OutputToStream(Aws::OStream& oStream, const char* lo
 #elseif($member.shape.enum)
   ${spaces}oStream << location << index << locationValue << ".${memberName}=" << ${member.shape.name}Mapper::GetNameFor${member.shape.name}(${memberVarName}) << "&";
 #elseif($member.shape.list)
+  ${spaces}unsigned ${lowerCaseVarName}Idx = 0;
   ${spaces}for(auto& item : ${memberVarName})
   ${spaces}{
-#if($member.shape.listMember.locationName)
-#set($location = $member.shape.listMember.locationName)
+#if($member.locationName)
+#set($location = $member.locationName)
 #else
 #set($location = $memberName)
 #end
+  ${spaces}  ${lowerCaseVarName}Idx++;
 #if($member.shape.listMember.shape.structure)
   ${spaces}  Aws::StringStream ${lowerCaseVarName}Ss;
-  ${spaces}  ${lowerCaseVarName}Ss << location << index << locationValue << ".${location}";
+  ${spaces}  ${lowerCaseVarName}Ss << location << index << locationValue << ".${location}." << ${lowerCaseVarName}Idx;
   ${spaces}  item.OutputToStream(oStream, ${lowerCaseVarName}Ss.str().c_str());
 #elseif($member.shape.listMember.shape.string)
-  ${spaces}  oStream << location << index << locationValue << ".${location}=" << StringUtils::URLEncode(item.c_str()) << "&";
+  ${spaces}  oStream << location << index << locationValue << ".${location}." << ${lowerCaseVarName}Idx << "=" << StringUtils::URLEncode(item.c_str()) << "&";
 #elseif($member.shape.listMember.shape.blob)
-  ${spaces}  oStream << location << index << locationValue << ".${location}=" << StringUtils::URLEncode(HashingUtils::Base64Encode(item).c_str()) << "&";
+  ${spaces}  oStream << location << index << locationValue << ".${location}." << ${lowerCaseVarName}Idx << "=" << StringUtils::URLEncode(HashingUtils::Base64Encode(item).c_str()) << "&";
 #elseif($member.shape.listMember.shape.primitive)
-  ${spaces}  oStream << location << index << locationValue << ".${location}=" << item << "&";
+  ${spaces}  oStream << location << index << locationValue << ".${location}." << ${lowerCaseVarName}Idx << "=" << item << "&";
 #elseif($member.shape.listMember.shape.enum)
-  ${spaces}  oStream << location << index << locationValue << ".${location}=" << ${member.shape.listMember.shape.name}Mapper::GetNameFor${member.shape.listMember.shape.name}(item) << "&";
+  ${spaces}  oStream << location << index << locationValue << ".${location}." << ${lowerCaseVarName}Idx << "=" << ${member.shape.listMember.shape.name}Mapper::GetNameFor${member.shape.listMember.shape.name}(item) << "&";
 #end
   ${spaces}}
 #end