make sure static ProxyFactory exists before instantiating static AnnotationFactory with it
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/proxy/branches/version-2.0-work@1000297 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationFactory.java b/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationFactory.java
index ae6dc37..346d113 100644
--- a/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationFactory.java
+++ b/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationFactory.java
@@ -45,9 +45,34 @@
*/
public class AnnotationFactory {
/** Statically available instance */
- public static final AnnotationFactory INSTANCE = new AnnotationFactory();
+ public static final AnnotationFactory INSTANCE;
- //underlying proxyfactory implementation based on org.apache.commons.proxy2.jdk.JdkProxyFactory
+ private static final ProxyFactory PROXY_FACTORY;
+
+ static {
+
+ //underlying proxyfactory implementation based on org.apache.commons.proxy2.jdk.JdkProxyFactory
+ PROXY_FACTORY = new AbstractProxyFactory() {
+
+ public <T> T createInvokerProxy(ClassLoader classLoader, final Invoker invoker, Class<?>... proxyClasses) {
+ throw new UnsupportedOperationException();
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> T createInterceptorProxy(ClassLoader classLoader, Object target, Interceptor interceptor,
+ Class<?>... proxyClasses) {
+ return (T) Proxy.newProxyInstance(classLoader, proxyClasses, new InterceptorInvocationHandler(target,
+ interceptor));
+ }
+
+ public <T> T createDelegatorProxy(ClassLoader classLoader, ObjectProvider<?> delegateProvider,
+ Class<?>... proxyClasses) {
+ throw new UnsupportedOperationException();
+ }
+ };
+
+ INSTANCE = new AnnotationFactory();
+ }
private static class InterceptorInvocationHandler implements InvocationHandler, Serializable {
/** Serialization version */
@@ -116,25 +141,6 @@
}
}
- private static final ProxyFactory PROXY_FACTORY = new AbstractProxyFactory() {
-
- public <T> T createInvokerProxy(ClassLoader classLoader, final Invoker invoker, Class<?>... proxyClasses) {
- throw new UnsupportedOperationException();
- }
-
- @SuppressWarnings("unchecked")
- public <T> T createInterceptorProxy(ClassLoader classLoader, Object target, Interceptor interceptor,
- Class<?>... proxyClasses) {
- return (T) Proxy.newProxyInstance(classLoader, proxyClasses, new InterceptorInvocationHandler(target,
- interceptor));
- }
-
- public <T> T createDelegatorProxy(ClassLoader classLoader, ObjectProvider<?> delegateProvider,
- Class<?>... proxyClasses) {
- throw new UnsupportedOperationException();
- }
- };
-
private static final Invoker ANNOTATION_INVOKER = new Invoker() {
/** Serialization version */
