You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2009/07/27 15:51:49 UTC
svn commit: r798132 - in
/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container:
BlueprintContainerImpl.java ServiceRecipe.java
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;
}