| Chunk |
|---|
| Conflicting content |
|---|
RelationManager relationManager, CommentServiceConfig config,
DocumentModel docMessage) throws Exception {
log.debug("Processing relations cleanup on Comment removal");
<<<<<<< HEAD
String typeName = docMessage.getType();
if ("Comment".equals(typeName) || "Post".equals(typeName)) {
=======
final Type documentType = docMessage.getDocumentType();
if ("Comment".equals(documentType.getName())) {
>>>>>>> bcd2efbf6472eeb0e49830c6496bde7e19a08d13
onCommentRemoved(relationManager, config, docMessage);
}
} |
| Solution content |
|---|
RelationManager relationManager, CommentServiceConfig config,
DocumentModel docMessage) throws Exception {
log.debug("Processing relations cleanup on Comment removal");
String typeName = docMessage.getType();
if ("Comment".equals(typeName) || "Post".equals(typeName)) {
onCommentRemoved(relationManager, config, docMessage);
}
} |
| File |
|---|
| CommentRemovedEventListener.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |