From af552fe7f80f62b979d3025a1290627c2d29cb36 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Thu, 17 Jan 2019 16:34:05 +0100 Subject: [PATCH] when checking class file version, consider only 'major' part --- .../instrumentation/NotNullInstrumentingBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/NotNullInstrumentingBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/NotNullInstrumentingBuilder.java index 717daaa916fe..4ace09db6ccd 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/NotNullInstrumentingBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/NotNullInstrumentingBuilder.java @@ -20,7 +20,6 @@ import com.intellij.compiler.instrumentation.InstrumentationClassFinder; import com.intellij.compiler.notNullVerification.NotNullVerifyingInstrumenter; import com.intellij.openapi.diagnostic.Logger; import com.intellij.util.ArrayUtil; -import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -68,7 +67,8 @@ public class NotNullInstrumentingBuilder extends BaseInstrumentingBuilder{ @Override protected boolean canInstrument(CompiledClass compiledClass, int classFileVersion) { - return classFileVersion >= Opcodes.V1_5 && !"module-info".equals(compiledClass.getClassName()); + // in the class version consider only 'major' part + return (classFileVersion & 0xFF) >= Opcodes.V1_5 && !"module-info".equals(compiledClass.getClassName()); } // todo: probably instrument other NotNull-like annotations defined in project settings?