Browse Source

changes getDefinedPackage back to getPackage when Java is < 9.

tags/rel_3_23_0_ga
chibash 6 years ago
parent
commit
b86c148882
3 changed files with 13 additions and 2 deletions
  1. 3
    1
      build.xml
  2. BIN
      javassist.jar
  3. 10
    1
      src/main/javassist/Loader.java

+ 3
- 1
build.xml View File

@@ -32,6 +32,7 @@
<path id="test.compile.classpath">
<pathelement location="${build.classes.dir}"/>
<pathelement location="${lib.dir}/junit.jar"/>
<pathelement location="${lib.dir}/hamcrest.jar"/>
</path>

<property name="test.compile.classpath" refid="test.compile.classpath"/>
@@ -39,7 +40,8 @@
<path id="test.classpath">
<pathelement location="${test.build.dir}"/>
<pathelement location="${lib.dir}/junit.jar"/>
<pathelement location="${build.classes.dir}"/>
<pathelement location="${lib.dir}/hamcrest.jar"/>
<pathelement location="${build.classes.dir}"/>
</path>

<property name="test.classpath" refid="test.classpath"/>

BIN
javassist.jar View File


+ 10
- 1
src/main/javassist/Loader.java View File

@@ -23,6 +23,8 @@ import java.util.Arrays;
import java.util.Hashtable;
import java.util.Vector;

import javassist.bytecode.ClassFile;

/**
* The class loader for Javassist.
*
@@ -360,7 +362,7 @@ public class Loader extends ClassLoader {
int i = name.lastIndexOf('.');
if (i != -1) {
String pname = name.substring(0, i);
if (getDefinedPackage(pname) == null)
if (isDefinedPackage(pname))
try {
definePackage(
pname, null, null, null, null, null, null, null);
@@ -376,6 +378,13 @@ public class Loader extends ClassLoader {
return defineClass(name, classfile, 0, classfile.length, domain);
}

private boolean isDefinedPackage(String name) {
if (ClassFile.MAJOR_VERSION >= ClassFile.JAVA_9)
return getDefinedPackage(name) == null;
else
return getPackage(name) == null;
}

protected Class<?> loadClassByDelegation(String name)
throws ClassNotFoundException
{

Loading…
Cancel
Save