svn commit: r732345 - /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java

[ie...@apache.org]

Author: ieb
Date: Wed Jan  7 06:07:02 2009
New Revision: 732345

URL: http://svn.apache.org/viewvc?rev=732345&view=rev
Log:
SHINDIG-718
Patch by Chico Charlesworth
Fixes: Building shindig from behind a proxy fails
Thanks

Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java?rev=732345&r1=732344&r2=732345&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java Wed Jan  7 06:07:02 2009
@@ -77,7 +77,10 @@
     this(DEFAULT_MAX_OBJECT_SIZE);
   }
 
-  @Inject(optional=true)
+  // TODO Re-add Inject annotation once shindig is upgraded to guice 2.0, because at the moment this causes problems
+  // when running shindig behind a proxy as guice still injects a proxy provider even though optional is set to true.
+  // See issue http://code.google.com/p/google-guice/issues/detail?id=107 for more details.
+  // @Inject(optional=true)
   public void setProxyProvider(Provider<Proxy> proxyProvider) {
     this.proxyProvider = proxyProvider;
   }