Migrated attachment for Guice issue 337, comment 0

assistedinject-classload.patch

Index: extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java
===================================================================
--- extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java	(revision 846)
+++ extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider.java	(working copy)
@@ -25,6 +25,7 @@
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Provider;
+import com.google.inject.internal.BytecodeGen;
 import com.google.inject.internal.Errors;
 import com.google.inject.spi.Dependency;
 import com.google.inject.spi.HasDependencies;
@@ -319,7 +320,7 @@
       }
     };
 
-    return factoryType.cast(Proxy.newProxyInstance(factoryType.getClassLoader(),
+    return factoryType.cast(Proxy.newProxyInstance(BytecodeGen.getClassLoader(factoryType),
         new Class[] {factoryType}, invocationHandler));
   }
 
Index: extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java
===================================================================
--- extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java	(revision 847)
+++ extensions/assistedinject/src/com/google/inject/assistedinject/FactoryProvider2.java	(working copy)
@@ -33,6 +33,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.spi.Message;
@@ -120,7 +121,7 @@
       throw new ConfigurationException(e.getErrors().getMessages());
     }
 
-    factory = factoryType.cast(Proxy.newProxyInstance(factoryType.getClassLoader(),
+    factory = factoryType.cast(Proxy.newProxyInstance(BytecodeGen.getClassLoader(factoryType),
         new Class[] { factoryType }, this));
   }