[jbehave-scm] [950] trunk/jbehave-core/src/java/org/jbehave/container/pico/AbstractPicoContainer.java: Ensure components are returned only if not null.

[mauro]

Title: [950] trunk/jbehave-core/src/java/org/jbehave/container/pico/AbstractPicoContainer.java: Ensure components are returned only if not null.

Revision

950

Author

mauro

Date

2008-09-28 10:25:43 -0500 (Sun, 28 Sep 2008)

Log Message

Ensure components are returned only if not null.

Modified Paths

• trunk/jbehave-core/src/java/org/jbehave/container/pico/AbstractPicoContainer.java

Diff

Modified: trunk/jbehave-core/src/java/org/jbehave/container/pico/AbstractPicoContainer.java (949 => 950)

--- trunk/jbehave-core/src/java/org/jbehave/container/pico/AbstractPicoContainer.java	2008-09-27 17:27:10 UTC (rev 949)
+++ trunk/jbehave-core/src/java/org/jbehave/container/pico/AbstractPicoContainer.java	2008-09-28 15:25:43 UTC (rev 950)
@@ -47,10 +47,14 @@
             throw new ComponentNotFoundException(message);
         }
         if (key != null) {
+            T component = null;
             // a key has been provided: return the component for that key
             for (ComponentAdapter<T> adapter : adapters) {
                 if (key.equals(adapter.getComponentKey())) {
-                    return adapter.getComponentInstance(container, type);
+                    component = adapter.getComponentInstance(container, type);
+                    if ( component != null ){
+                        return component;
+                    }
                 }
             }
             String message = format("No component registered in container of type {0} and for key {1}", type, key);

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email