shishkovilja commented on code in PR #13426:
URL: https://github.com/apache/ignite/pull/13426#discussion_r3756305881
##########
modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java:
##########
@@ -471,36 +478,27 @@ private boolean filterDropsEvent(Event evt) {
}
/** {@inheritDoc} */
- @Override public void writeExternal(ObjectOutput out) throws IOException {
- boolean b = filterBytes != null;
+ @Override public void marshal(Marshaller marsh) throws
IgniteCheckedException {
+ assert (clsName == null) == (depInfo == null);
- out.writeBoolean(b);
-
- if (b) {
- U.writeByteArray(out, filterBytes);
- U.writeString(out, clsName);
- out.writeObject(depInfo);
- }
- else
- out.writeObject(filter);
-
- out.writeObject(types);
+ /** Are marshaled in {@link #p2pUnmarshal(UUID, GridKernalContext)}. */
+ if (filter != null && depInfo == null)
+ filterBytes = marsh.marshal(filter);
}
/** {@inheritDoc} */
- @Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
- boolean b = in.readBoolean();
+ @Override public void unmarshal(Marshaller marsh, ClassLoader clsLdr)
throws IgniteCheckedException {
+ assert (clsName == null) == (depInfo == null);
- if (b) {
+ /** Are unmarshaled in {@link #p2pUnmarshal(UUID, GridKernalContext)}.
*/
Review Comment:
Confusing JavaDoc. May be NOT marshalled in `#p2pUnmarshal`?
##########
modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java:
##########
@@ -1845,6 +1846,18 @@ protected <T extends Message> T
readMessage(TcpDiscoveryIoSession ses, long time
if (msg != null && sslMsgPattern.matcher(msg).matches())
streamCorruptedCause.initCause(new SSLException("Detected
SSL alert in StreamCorruptedException"));
}
+
+ if (X.hasCause(e, ClassNotFoundException.class)) {
Review Comment:
Do we have any test on this exception?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
