Skip to content

Commit afecc1d

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

4 files changed

Lines changed: 10 additions & 14 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

modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerLocalMessageListenerSelfTest.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@
2222
import org.apache.ignite.IgniteCheckedException;
2323
import org.apache.ignite.configuration.IgniteConfiguration;
2424
import org.apache.ignite.internal.GridKernalContext;
25-
import org.apache.ignite.internal.managers.communication.GridIoUserMessage;
2625
import org.apache.ignite.lang.IgniteBiPredicate;
2726
import org.apache.ignite.plugin.AbstractTestPluginProvider;
2827
import org.apache.ignite.plugin.ExtensionRegistry;
2928
import org.apache.ignite.plugin.PluginContext;
30-
import org.apache.ignite.plugin.extensions.communication.MessageFactory;
31-
import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
3229
import org.apache.ignite.spi.IgniteSpi;
3330
import org.apache.ignite.spi.IgniteSpiAdapter;
3431
import org.apache.ignite.spi.IgniteSpiContext;
@@ -46,9 +43,6 @@
4643
* Test Managers to add and remove local message listener.
4744
*/
4845
public class GridManagerLocalMessageListenerSelfTest extends GridCommonAbstractTest {
49-
/** */
50-
private static final short DIRECT_TYPE = 210;
51-
5246
/** {@inheritDoc} */
5347
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
5448
IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
@@ -219,11 +213,7 @@ public static class TestPluginProvider extends AbstractTestPluginProvider {
219213

220214
/** {@inheritDoc} */
221215
@Override public void initExtensions(PluginContext ctx, ExtensionRegistry registry) {
222-
registry.registerExtension(MessageFactoryProvider.class, new MessageFactoryProvider() {
223-
@Override public void registerAll(MessageFactory factory) {
224-
factory.register(DIRECT_TYPE, GridIoUserMessage::new);
225-
}
226-
});
216+
// No-op.
227217
}
228218
}
229219
}

modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private static class BrokenMessage extends IgniteDiagnosticRequest {
8484
return (byte)242;
8585
}
8686

87-
return super.directType();
87+
return -61;
8888
}
8989
}
9090
}

0 commit comments

Comments
 (0)