Merge remote-tracking branch 'origin/jetty-9.4.x'
This commit is contained in:
commit
1a69841600
|
@ -70,7 +70,7 @@ public class AnnotationParser
|
|||
{
|
||||
private static final Logger LOG = Log.getLogger(AnnotationParser.class);
|
||||
|
||||
protected static int ASM_OPCODE_VERSION = Opcodes.ASM5; //compatibility of api
|
||||
protected static int ASM_OPCODE_VERSION = Opcodes.ASM6; //compatibility of api
|
||||
|
||||
protected Map<String, List<String>> _parsedClassNames = new ConcurrentHashMap<>();
|
||||
private final int _javaPlatform;
|
||||
|
@ -486,28 +486,7 @@ public class AnnotationParser
|
|||
{
|
||||
if (javaPlatform==0)
|
||||
javaPlatform = JavaVersion.VERSION.getPlatform();
|
||||
// TODO can only support 8 until ASM 6 is available
|
||||
if (javaPlatform!=8)
|
||||
LOG.warn("Annotation parsing only supports java8 until ASM6 upgrade");
|
||||
_javaPlatform = 8;
|
||||
}
|
||||
|
||||
public AnnotationParser()
|
||||
{
|
||||
this(JavaVersion.VERSION.getPlatform());
|
||||
}
|
||||
|
||||
/**
|
||||
* @param javaPlatform The target java version or 0 for the current runtime.
|
||||
*/
|
||||
public AnnotationParser(int javaPlatform)
|
||||
{
|
||||
if (javaPlatform==0)
|
||||
javaPlatform = JavaVersion.VERSION.getPlatform();
|
||||
// TODO can only support 8 until ASM 6 is available
|
||||
if (javaPlatform!=8)
|
||||
LOG.warn("Annotation parsing only supports java8 until ASM6 upgrade");
|
||||
_javaPlatform = 8;
|
||||
_javaPlatform = javaPlatform;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue