diff options
Diffstat (limited to 'src/main/javassist/util/proxy')
-rw-r--r-- | src/main/javassist/util/proxy/FactoryHelper.java | 8 | ||||
-rw-r--r-- | src/main/javassist/util/proxy/SerializedProxy.java | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/main/javassist/util/proxy/FactoryHelper.java b/src/main/javassist/util/proxy/FactoryHelper.java index 9b2b791c..b17b78ed 100644 --- a/src/main/javassist/util/proxy/FactoryHelper.java +++ b/src/main/javassist/util/proxy/FactoryHelper.java @@ -152,13 +152,13 @@ public class FactoryHelper { Object[] args; if (domain == null) { method = defineClass1; - args = new Object[] { cf.getName(), b, new Integer(0), - new Integer(b.length) }; + args = new Object[] { cf.getName(), b, Integer.valueOf(0), + Integer.valueOf(b.length) }; } else { method = defineClass2; - args = new Object[] { cf.getName(), b, new Integer(0), - new Integer(b.length), domain }; + args = new Object[] { cf.getName(), b, Integer.valueOf(0), + Integer.valueOf(b.length), domain }; } return toClass2(method, loader, args); diff --git a/src/main/javassist/util/proxy/SerializedProxy.java b/src/main/javassist/util/proxy/SerializedProxy.java index 36425a88..a0485da0 100644 --- a/src/main/javassist/util/proxy/SerializedProxy.java +++ b/src/main/javassist/util/proxy/SerializedProxy.java @@ -17,6 +17,7 @@ package javassist.util.proxy; import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; import java.io.ObjectStreamException; import java.security.AccessController; import java.security.PrivilegedActionException; @@ -82,10 +83,16 @@ class SerializedProxy implements Serializable { ProxyFactory f = new ProxyFactory(); f.setSuperclass(loadClass(superClass)); f.setInterfaces(infs); - Proxy proxy = (Proxy)f.createClass(filterSignature).newInstance(); + Proxy proxy = (Proxy)f.createClass(filterSignature).getConstructor().newInstance(); proxy.setHandler(handler); return proxy; } + catch (NoSuchMethodException e) { + throw new java.io.InvalidClassException(e.getMessage()); + } + catch (InvocationTargetException e) { + throw new java.io.InvalidClassException(e.getMessage()); + } catch (ClassNotFoundException e) { throw new java.io.InvalidClassException(e.getMessage()); } |