| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
=======
>>>>>>> b32ea41b11b9f255c39659bd388b61cc49a4776c
// only if message counting is on, and only for multicast messages (http://jira.jboss.com/jira/browse/JGRP-233)
if(max_bytes > 0 && batch.dest() == null && !batch.isEmpty()) {
boolean send_stable_msg=false; |
| Solution content |
|---|
}
}
// only if message counting is on, and only for multicast messages (http://jira.jboss.com/jira/browse/JGRP-233)
if(max_bytes > 0 && batch.dest() == null && !batch.isEmpty()) {
boolean send_stable_msg=false; |
| File |
|---|
| STABLE.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |