Skip to content

Commit 913d638

Browse files
authored
IGNITE-28538 Remove the rejected field in MetadataRemoveProposedMessage (#13021)
1 parent c24e15f commit 913d638

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/MetadataRemoveProposedMessage.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,12 @@ public final class MetadataRemoveProposedMessage implements DiscoveryCustomMessa
4747
@Order(2)
4848
int typeId;
4949

50-
/** Message acceptance status. */
51-
@Order(3)
52-
boolean rejected;
53-
5450
/** Message received on coordinator. */
55-
@Order(4)
51+
@Order(3)
5652
boolean onCoordinator = true;
5753

5854
/** */
59-
@Order(5)
55+
@Order(4)
6056
String errMsg;
6157

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

8480
/** {@inheritDoc} */
8581
@Nullable @Override public DiscoveryCustomMessage ackMessage() {
86-
return !rejected ? new MetadataRemoveAcceptedMessage(typeId) : null;
82+
return !rejected() ? new MetadataRemoveAcceptedMessage(typeId) : null;
8783
}
8884

8985
/** {@inheritDoc} */
@@ -95,13 +91,12 @@ public MetadataRemoveProposedMessage(int typeId, UUID origNodeId) {
9591
* @param errMsg Error message caused this update to be rejected.
9692
*/
9793
void markRejected(String errMsg) {
98-
rejected = true;
9994
this.errMsg = errMsg;
10095
}
10196

10297
/** */
10398
boolean rejected() {
104-
return rejected;
99+
return errMsg != null;
105100
}
106101

107102
/** */
@@ -133,5 +128,4 @@ public void setOnCoordinator(boolean onCoordinator) {
133128
@Override public String toString() {
134129
return S.toString(MetadataRemoveProposedMessage.class, this);
135130
}
136-
137131
}

0 commit comments

Comments
 (0)