commit 2e3b21ccfed8b2ff86ba10ccc1eeb4f820af1601
author Stuart McCulloch <mcculls@gmail.com> Wed Apr 16 19:42:08 2014 +0100
committer Stuart McCulloch <mcculls@gmail.com> Wed Apr 16 19:42:08 2014 +0100
tree 72b170b3590179e264fe1ee5c8095e951baf18a6
parent 210d3f409d57f83a644b69000ae8399d5c0dc07b

Detect whether the BeanManager in PlexusSpaceModule is a delegate or a replacement for the PlexusLifecycleManager

org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusSpaceModule.java

diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusSpaceModule.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusSpaceModule.java
index 2664548..ac78a1c 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusSpaceModule.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusSpaceModule.java
@@ -83,9 +83,11 @@
         binder.bind( PlexusBeanLocator.class ).to( DefaultPlexusBeanLocator.class );
         binder.bind( PlexusContainer.class ).to( PseudoPlexusContainer.class );
 
-        final BeanManager manager = new PlexusLifecycleManager( binder.getProvider( Context.class ), //
-                                                                binder.getProvider( LoggerManager.class ), //
-                                                                slf4jLoggerFactoryProvider, delegate );
+        final BeanManager manager =
+            delegate instanceof PlexusLifecycleManager ? delegate
+                            : new PlexusLifecycleManager( binder.getProvider( Context.class ),
+                                                          binder.getProvider( LoggerManager.class ),
+                                                          slf4jLoggerFactoryProvider, delegate );
 
         binder.bind( BeanManager.class ).toInstance( manager );