You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/07/31 02:38:29 UTC
svn commit: r799476 - in
/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint:
container/BlueprintRepository.java di/AbstractRecipe.java
Author: gawor
Date: Fri Jul 31 00:38:29 2009
New Revision: 799476
URL: http://svn.apache.org/viewvc?rev=799476&view=rev
Log:
some minor updates
Modified:
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintRepository.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/AbstractRecipe.java
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintRepository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintRepository.java?rev=799476&r1=799475&r2=799476&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintRepository.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintRepository.java Fri Jul 31 00:38:29 2009
@@ -147,8 +147,8 @@
public Map<String, Object> createAll(Collection<String> names, boolean allowReentry) throws ComponentDefinitionException {
ExecutionContext oldContext = ExecutionContext.Holder.setContext(this);
try {
- Map<String, Object> instances = createInstances(names, allowReentry);
- for (String name : names) {
+ Map<String, Object> instances = createInstances(names, allowReentry);
+ for (String name : instances.keySet()) {
Object obj = instances.get(name);
instances.put(name, convert(name, obj));
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/AbstractRecipe.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/AbstractRecipe.java?rev=799476&r1=799475&r2=799476&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/AbstractRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/AbstractRecipe.java Fri Jul 31 00:38:29 2009
@@ -55,7 +55,7 @@
synchronized (context.getInstanceLock()) {
if (creating && context.isCreateReentered()) {
- ArrayList<Recipe> circularity = new ArrayList<Recipe>();
+ ArrayList<Recipe> circularity = new ArrayList<Recipe>(1);
circularity.add(this);
throw new CircularDependencyException("Dynamic cycle detected in recipe", circularity);
}