Migrated attachment for Guice issue 337, comment 5

GUICE_ISSUE_337_20100504.patch

Index: extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java
===================================================================
--- extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java	(revision 1157)
+++ extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java	(working copy)
@@ -23,6 +23,7 @@
 import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
 import static com.google.inject.internal.Annotations.getKey;
+import com.google.inject.internal.BytecodeGen;
 import com.google.inject.internal.Errors;
 import com.google.inject.internal.ErrorsException;
 import com.google.inject.internal.ImmutableMap;
@@ -365,7 +366,7 @@
 
     @SuppressWarnings("unchecked") // we imprecisely treat the class literal of T as a Class<T>
     Class<F> factoryRawType = (Class) factoryType.getRawType();
-    return factoryRawType.cast(Proxy.newProxyInstance(factoryRawType.getClassLoader(),
+    return factoryRawType.cast(Proxy.newProxyInstance(BytecodeGen.getClassLoader(factoryRawType),
         new Class[] { factoryRawType }, invocationHandler));
   }
 
Index: extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java
===================================================================
--- extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java	(revision 1157)
+++ extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java	(working copy)
@@ -28,6 +28,7 @@
 import com.google.inject.ProvisionException;
 import com.google.inject.TypeLiteral;
 import static com.google.inject.internal.Annotations.getKey;
+import com.google.inject.internal.BytecodeGen;
 import com.google.inject.internal.Errors;
 import com.google.inject.internal.ErrorsException;
 import com.google.inject.internal.ImmutableList;
@@ -214,7 +215,7 @@
       throw new ConfigurationException(e.getErrors().getMessages());
     }
     
-    factory = factoryRawType.cast(Proxy.newProxyInstance(factoryRawType.getClassLoader(),
+    factory = factoryRawType.cast(Proxy.newProxyInstance(BytecodeGen.getClassLoader(factoryRawType),
         new Class[] { factoryRawType }, this));
   }