Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,12 @@ public final class MetadataRemoveProposedMessage implements DiscoveryCustomMessa
@Order(2)
int typeId;

/** Message acceptance status. */
@Order(3)
boolean rejected;

/** Message received on coordinator. */
@Order(4)
@Order(3)
boolean onCoordinator = true;

/** */
@Order(5)
@Order(4)
String errMsg;

/** Constructor. */
Expand All @@ -83,7 +79,7 @@ public MetadataRemoveProposedMessage(int typeId, UUID origNodeId) {

/** {@inheritDoc} */
@Nullable @Override public DiscoveryCustomMessage ackMessage() {
return !rejected ? new MetadataRemoveAcceptedMessage(typeId) : null;
return !rejected() ? new MetadataRemoveAcceptedMessage(typeId) : null;
}

/** {@inheritDoc} */
Expand All @@ -95,13 +91,12 @@ public MetadataRemoveProposedMessage(int typeId, UUID origNodeId) {
* @param errMsg Error message caused this update to be rejected.
*/
void markRejected(String errMsg) {
rejected = true;
this.errMsg = errMsg;
}

/** */
boolean rejected() {
return rejected;
return errMsg != null;
}

/** */
Expand Down Expand Up @@ -133,5 +128,4 @@ public void setOnCoordinator(boolean onCoordinator) {
@Override public String toString() {
return S.toString(MetadataRemoveProposedMessage.class, this);
}

}
Loading