Do not bind component already binded by the parent

jfarcand · Jun 14, 2011 · 33a0f5a · 33a0f5a
1 parent c59d49c
commit 33a0f5a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/...simple-jaxrs/src/main/java/org/sonatype/restsimple/jaxrs/guice/RestSimpleJaxrsModule.java b/...simple-jaxrs/src/main/java/org/sonatype/restsimple/jaxrs/guice/RestSimpleJaxrsModule.java
@@ -99,10 +99,14 @@ protected final void configureServlets() {
         }
 
         NegotiationTokenGenerator token = injector.getInstance( NegotiationTokenGenerator.class );
-        bind(NegotiationTokenGenerator.class).toInstance( token );
+        if (parent == null || parent.getBinding(NegotiationTokenGenerator.class ) == null) {
+            bind(NegotiationTokenGenerator.class).toInstance( token );
+        }
 
-        ServiceHandlerMapper mapper = injector.getInstance( ServiceHandlerMapper.class );
-        bind( ServiceHandlerMapper.class ).toInstance( mapper );
+        ServiceHandlerMapper mapper = injector().getInstance(  ServiceHandlerMapper.class );
+        if (parent == null || parent.getBinding(ServiceHandlerMapper.class ) == null) {
+            bind( ServiceHandlerMapper.class ).toInstance( mapper );
+        }
 
         sdSet.addAll( defineServices( injector ) );
         ServiceDefinitionGenerator generator = new JAXRSServiceDefinitionGenerator( new ResourceModuleConfig<Module>() {

diff --git a/...ks/src/main/java/org/sonatype/restsimple/sitebricks/guice/RestSimpleSitebricksModule.java b/...ks/src/main/java/org/sonatype/restsimple/sitebricks/guice/RestSimpleSitebricksModule.java
@@ -111,10 +111,14 @@ public void install(Module module) {
         });
 
         NegotiationTokenGenerator token = injector.getInstance( NegotiationTokenGenerator.class );
-        bind(NegotiationTokenGenerator.class).toInstance( token );
+        if (parent == null || parent.getBinding(NegotiationTokenGenerator.class ) == null) {        
+            bind(NegotiationTokenGenerator.class).toInstance( token );
+        }
 
         ServiceHandlerMapper mapper = injector().getInstance(  ServiceHandlerMapper.class );
-        bind( ServiceHandlerMapper.class ).toInstance( mapper );
+        if (parent == null || parent.getBinding(ServiceHandlerMapper.class ) == null) {
+            bind( ServiceHandlerMapper.class ).toInstance( mapper );
+        }
 
         if (sdSet != null && sdSet.size() > 0) {
             for (ServiceDefinition sd : sdSet) {