From 02b47cd58fb913e6d0f1be95d09f54c5bcf36464 Mon Sep 17 00:00:00 2001
From: JCgH4164838Gh792C124B5
<43964333+JCgH4164838Gh792C124B5@users.noreply.github.com>
Date: Fri, 30 Nov 2018 00:54:00 -0500
Subject: Re-enable JDK7 runtime compatibility for Javassist 3.x (until source
changes preclude it). pom.xml changes: - lower compile source/target to 1.7
(from 1.8, introduced with Javassist 3.24.0)
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c1fc343c..6d42cf18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,8 +151,8 @@
maven-compiler-plugin
3.2
- 1.8
- 1.8
+ 1.7
+ 1.7
11
11
-parameters
--
cgit v1.2.3
From 85d69ea6b380ee35dfcf40ca3d98ab59f0b01916 Mon Sep 17 00:00:00 2001
From: chibash
Date: Fri, 30 Nov 2018 15:41:39 +0900
Subject: modifies build.xml to support JDK 7.
---
build.xml | 4 ++--
javassist.jar | Bin 766405 -> 766391 bytes
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index ec805b0f..1c3f8b0f 100644
--- a/build.xml
+++ b/build.xml
@@ -79,8 +79,8 @@
destdir="${build.classes.dir}"
debug="on"
deprecation="on"
- source="1.8"
- target="1.8"
+ source="1.7"
+ target="1.7"
optimize="off"
includeantruntime="true"
includes="**">
diff --git a/javassist.jar b/javassist.jar
index 73e3f0fd..a4781002 100644
Binary files a/javassist.jar and b/javassist.jar differ
--
cgit v1.2.3
From a82e2d71bd3da248dab836f4e150ff08cc0e6915 Mon Sep 17 00:00:00 2001
From: chibash
Date: Wed, 5 Dec 2018 00:19:56 +0900
Subject: fixes a bug reported in #228
---
javassist.jar | Bin 766391 -> 766400 bytes
src/main/javassist/util/proxy/ProxyFactory.java | 4 +++-
.../javassist/proxyfactory/ProxyFactoryTest.java | 12 ++++++++++++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/javassist.jar b/javassist.jar
index a4781002..3099d18a 100644
Binary files a/javassist.jar and b/javassist.jar differ
diff --git a/src/main/javassist/util/proxy/ProxyFactory.java b/src/main/javassist/util/proxy/ProxyFactory.java
index 0c39a508..55f13059 100644
--- a/src/main/javassist/util/proxy/ProxyFactory.java
+++ b/src/main/javassist/util/proxy/ProxyFactory.java
@@ -622,7 +622,9 @@ public class ProxyFactory {
* {@code java.lang.invoke.MethodHandles.Lookup}.
*/
private Class getClassInTheSamePackage() {
- if (superClass != null && superClass != OBJECT_TYPE)
+ if (basename.startsWith("javassist.util.proxy.")) // maybe the super class is java.*
+ return this.getClass();
+ else if (superClass != null && superClass != OBJECT_TYPE)
return superClass;
else if (interfaces != null && interfaces.length > 0)
return interfaces[0];
diff --git a/src/test/javassist/proxyfactory/ProxyFactoryTest.java b/src/test/javassist/proxyfactory/ProxyFactoryTest.java
index 3189b568..43a96bb6 100644
--- a/src/test/javassist/proxyfactory/ProxyFactoryTest.java
+++ b/src/test/javassist/proxyfactory/ProxyFactoryTest.java
@@ -128,4 +128,16 @@ public class ProxyFactoryTest extends TestCase {
public static class TestDefaultC2 extends TestDefaultC {
public int baz() { return super.foo(); }
}
+
+ public void testJava11() throws Exception {
+ ProxyFactory factory = new ProxyFactory();
+ factory.setSuperclass(java.util.HashMap.class);
+ java.util.HashMap e = (java.util.HashMap)factory.create(null, null, new MethodHandler() {
+ @Override
+ public Object invoke(Object self, Method thisMethod,
+ Method proceed, Object[] args) throws Throwable {
+ return proceed.invoke(self, args);
+ }
+ });
+ }
}
--
cgit v1.2.3