Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 19381 invoked from network); 27 Jul 2009 13:51:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Jul 2009 13:51:09 -0000 Received: (qmail 82098 invoked by uid 500); 27 Jul 2009 13:52:14 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 82030 invoked by uid 500); 27 Jul 2009 13:52:13 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 82021 invoked by uid 99); 27 Jul 2009 13:52:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jul 2009 13:52:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jul 2009 13:52:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 76FDA2388989; Mon, 27 Jul 2009 13:51:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r798132 - in /geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container: BlueprintContainerImpl.java ServiceRecipe.java Date: Mon, 27 Jul 2009 13:51:49 -0000 To: scm@geronimo.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090727135149.76FDA2388989@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gnodet Date: Mon Jul 27 13:51:49 2009 New Revision: 798132 URL: http://svn.apache.org/viewvc?rev=798132&view=rev Log: Quick revert of 797601 Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java?rev=798132&r1=798131&r2=798132&view=diff ============================================================================== --- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java (original) +++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java Mon Jul 27 13:51:49 2009 @@ -642,7 +642,7 @@ } } } - if (r.isEager() && enabled) { + if (/*r.isEager() &&*/ enabled) { r.register(); } } Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java?rev=798132&r1=798131&r2=798132&view=diff ============================================================================== --- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java (original) +++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java Mon Jul 27 13:51:49 2009 @@ -131,9 +131,9 @@ } ServiceRegistrationProxy proxy = new ServiceRegistrationProxy(); addObject(proxy, true); - if (blueprintContainer.isServiceEnabled(this)) { + //if (blueprintContainer.isServiceEnabled(this)) { register(); - } + //} internalGetService(null, null); // null bundle means we don't want to retrieve the actual service when used with a ServiceFactory return proxy; }