[waffle-scm] [742] trunk/waffle-testing/src/main/java/org/codehaus/waffle/testing/registrar/RegistrarHelper.java: Use application container as parent of request container if session container is null.

[mauro]

Title: [waffle-scm] [742] trunk/waffle-testing/src/main/java/org/codehaus/waffle/testing/registrar/RegistrarHelper.java: Use application container as parent of request container if session container is null.

Revision

742

Author

mauro

Date

2008-06-19 06:02:23 -0500 (Thu, 19 Jun 2008)

Log Message

Use application container as parent of request container if session container is null.

Modified Paths

trunk/waffle-testing/src/main/java/org/codehaus/waffle/testing/registrar/RegistrarHelper.java

Diff

Modified: trunk/waffle-testing/src/main/java/org/codehaus/waffle/testing/registrar/RegistrarHelper.java (741 => 742)

--- trunk/waffle-testing/src/main/java/org/codehaus/waffle/testing/registrar/RegistrarHelper.java	2008-06-19 10:54:28 UTC (rev 741)
+++ trunk/waffle-testing/src/main/java/org/codehaus/waffle/testing/registrar/RegistrarHelper.java	2008-06-19 11:02:23 UTC (rev 742)
@@ -81,7 +81,8 @@
                 sessionContainer = new DefaultPicoContainer(applicationContainer);
                 return sessionContainer;
             case REQUEST:
-                requestContainer = new DefaultPicoContainer(sessionContainer);
+                requestContainer = new DefaultPicoContainer((sessionContainer != null ? sessionContainer
+                        : applicationContainer));
                 return requestContainer;
             default:
                 throw new WaffleException("Invalid context level " + level);

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email