| Chunk |
|---|
| Conflicting content |
|---|
FileReader reader = null;
try {
reader = new FileReader(file);
}catch(FileNotFoundException fe) {
fe.printStackTrace();
log.error(fe);
}
<<<<<<< HEAD
private LineObject populateTemplate(String[] lineAry) {
LineObject rowHeader = new LineObject();
=======
public Response testConnection(SynchConfig config) {
File file = new File(config.getFileName());
Response resp = new Response(ResponseStatus.FAILURE);
resp.setErrorCode(ResponseCode.FILE_EXCEPTION);
resp.setErrorText(fe.getMessage());
return resp;
}finally {
if(reader != null)
try {
reader.close();
} catch (IOException e) {
// This can safely be ignored. The file was opened successfully at this point.
}
}
Response resp = new Response(ResponseStatus.SUCCESS);
return resp;
}
private void populateTemplate(String[] lineAry) {
>>>>>>> 718ee86d0cd0b2190ce9dbffa118acfd2c79d9f2
Map |
| Solution content |
|---|
File file = new File(config.getFileName());
FileReader reader = null;
resp.setErrorText(fe.getMessage());
return resp;
}finally {
try {
if(reader != null)
try {
reader = new FileReader(file);
reader.close();
} catch (IOException e) {
}catch(FileNotFoundException fe) {
fe.printStackTrace();
log.error(fe);
}
resp.setErrorCode(ResponseCode.FILE_EXCEPTION);
Response resp = new Response(ResponseStatus.FAILURE);
public Response testConnection(SynchConfig config) {
// This can safely be ignored. The file was opened successfully at this point.
}
}
Response resp = new Response(ResponseStatus.SUCCESS);
return resp;
}
private void populateTemplate(String[] lineAry) {
Map |
| File |
|---|
| CSVAdapterForGenericObject.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method declaration |
| Method invocation |
| Method signature |
| Variable |