Skip to content

Commit a5743a2

Browse files
committed
Fix type conflict
1 parent 55c1e70 commit a5743a2

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
378378
@Override public void registerAll(MessageFactory factory) {
379379
// -54 is reserved for SQL.
380380
// We don't use the code‑generated serializer for CompressedMessage - serialization is highly customized.
381-
factory.register(-101, CompressedMessage::new);
381+
factory.register(-67, CompressedMessage::new);
382382
factory.register(-66, ErrorMessage::new, new ErrorMessageMarshallableSerializer(marsh, clsLdr));
383383
factory.register(-65, TxInfo::new, new TxInfoSerializer());
384384
factory.register(-64, TxEntriesInfo::new, new TxEntriesInfoSerializer());

modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteMessageFactoryImpl.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,13 @@ public IgniteMessageFactoryImpl(MessageFactoryProvider[] factories) {
105105
"Registration of new message types is forbidden.");
106106
}
107107

108-
supplier.get().registerAsDirectType(directType);
108+
try {
109+
supplier.get().registerAsDirectType(directType);
110+
}
111+
catch (NoClassDefFoundError | ExceptionInInitializerError e) {
112+
// Optional dependency not available (e.g. JTS for GridH2Geometry).
113+
// Registration will succeed when used in an environment with the dependency.
114+
}
109115

110116
int idx = directTypeToIndex(directType);
111117

0 commit comments

Comments
 (0)