| Chunk |
|---|
| Conflicting content |
|---|
if (parameterList != null && !parameterList.isEmpty()) {
for (int i = 0, size = parameterList.size(); i < size; i++) {
BasicNameValuePair parameter = parameterList.get(i);
<<<<<<< HEAD
if(!TextUtils.isEmpty(parameter.getName()) && !TextUtils.isEmpty(parameter.getValue())){
paramBuilder.append(URLEncoder.encode(parameter.getName(), UTF8_CHARSET));
paramBuilder.append("=");
paramBuilder.append(URLEncoder.encode(parameter.getValue(), UTF8_CHARSET));
paramBuilder.append("&");
}
=======
String name = parameter.getName();
String value = parameter.getValue();
if (TextUtils.isEmpty(name)) {
// Empty parameter name. Check the next one.
continue;
}
if (value == null) {
value = "";
}
paramBuilder.append(URLEncoder.encode(name, UTF8_CHARSET));
paramBuilder.append("=");
paramBuilder.append(URLEncoder.encode(value, UTF8_CHARSET));
paramBuilder.append("&");
>>>>>>> 888700f617e19b5ce503ceaac62f0777445bf5da
}
}
|
| Solution content |
|---|
if (parameterList != null && !parameterList.isEmpty()) {
for (int i = 0, size = parameterList.size(); i < size; i++) {
BasicNameValuePair parameter = parameterList.get(i);
String name = parameter.getName();
String value = parameter.getValue();
if (TextUtils.isEmpty(name)) {
// Empty parameter name. Check the next one.
continue;
}
if (value == null) {
value = "";
}
paramBuilder.append(URLEncoder.encode(name, UTF8_CHARSET));
paramBuilder.append("=");
paramBuilder.append(URLEncoder.encode(value, UTF8_CHARSET));
paramBuilder.append("&");
}
}
|
| File |
|---|
| NetworkConnectionImpl.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |