svn commit: r1089589 - /tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java

[hl...@apache.org]

Author: hlship
Date: Wed Apr  6 19:12:28 2011
New Revision: 1089589

URL: http://svn.apache.org/viewvc?rev=1089589&view=rev
Log:
TAP5-853: Deal with differences in generics across JDKs

Modified:
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java?rev=1089589&r1=1089588&r2=1089589&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java Wed Apr  6 19:12:28 2011
@@ -95,7 +95,13 @@ public class RegistryImpl implements Reg
     /**
      * The set of marker annotations for a builtin service.
      */
-    private final static Set<Class> BUILTIN = CollectionFactory.newSet(Builtin.class);
+    private final static Set<Class> BUILTIN = CollectionFactory.newSet();
+
+    // Split create/assign to appease generics gods
+    static
+    {
+        BUILTIN.add(Builtin.class);
+    }
 
     /**
      * Used to obtain the {@link org.apache.tapestry5.ioc.services.ClassFactory} service, which is
@@ -169,7 +175,7 @@ public class RegistryImpl implements Reg
         assert classFactory != null;
         assert proxyFactory != null;
         assert loggerSource != null;
-        
+
         this.loggerSource = loggerSource;
 
         operationTracker = new PerThreadOperationTracker(loggerSource.getLogger(Registry.class));