}
if (!combineConflict) {
for (Iterator<InitializationParameter> initParamIter =
getInitializationParameterSet().iterator();
initParamIter.hasNext();) {
InitializationParameter initParam =
initParamIter.next();
conflictedInitParameterNames.remove(initParam.getName());
}
}
for (Iterator<InitializationParameter> initParamIter =
other.getInitializationParameterSet().iterator();
initParamIter.hasNext();) {
InitializationParameter initParam =
initParamIter.next();
InitializationParameter origInitParam =
getInitializationParameterByName(initParam.getName());
if (origInitParam == null) {
getInitializationParameterSet().add(initParam);
} else if (combineConflict &&
!origInitParam.getValue().equals(initParam.getValue())) {
getConflictedInitParameterNames().add(initParam.getName());
}
}
for (Iterator<SecurityRoleReference> secRoleRefIter =
other.getSecurityRoleReferenceSet().iterator();