Skip to content

Commit 9cb2d4a

Browse files
authored
Merge pull request #216 from stevenschlansker/scs-bb-ab-svm
Blackbird, Afterburner: disable in native-image
2 parents 0e16583 + c3bbe3e commit 9cb2d4a

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/AfterburnerModule.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
public class AfterburnerModule extends Module
99
implements java.io.Serializable // is this necessary?
1010
{
11+
// TODO: replace with jackson-databind/NativeImageUtil.RUNNING_IN_SVM
12+
private static final boolean RUNNING_IN_SVM = System.getProperty("org.graalvm.nativeimage.imagecode") != null;
1113
private static final long serialVersionUID = 1L;
1214

1315
/*
@@ -49,6 +51,10 @@ public AfterburnerModule() { }
4951
@Override
5052
public void setupModule(SetupContext context)
5153
{
54+
if (RUNNING_IN_SVM)
55+
{
56+
return;
57+
}
5258
ClassLoader cl = _cfgUseValueClassLoader ? null : getClass().getClassLoader();
5359
context.addBeanDeserializerModifier(new DeserializerModifier(cl,
5460
_cfgUseOptimizedBeanDeserializer));

blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/BlackbirdModule.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
public class BlackbirdModule extends Module
1414
{
15+
// TODO: replace with jackson-databind/NativeImageUtil.RUNNING_IN_SVM
16+
private static final boolean RUNNING_IN_SVM = System.getProperty("org.graalvm.nativeimage.imagecode") != null;
1517
private Function<Class<?>, Lookup> _lookups;
1618

1719
public BlackbirdModule() {
@@ -35,6 +37,10 @@ public BlackbirdModule(Supplier<MethodHandles.Lookup> lookup) {
3537
@Override
3638
public void setupModule(SetupContext context)
3739
{
40+
if (RUNNING_IN_SVM)
41+
{
42+
return;
43+
}
3844
CrossLoaderAccess openSesame = new CrossLoaderAccess();
3945
context.addBeanDeserializerModifier(new BBDeserializerModifier(_lookups, openSesame));
4046
context.addBeanSerializerModifier(new BBSerializerModifier(_lookups, openSesame));

0 commit comments

Comments
 (0)