[java-opensaml COMMIT] /trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov  5 12:35:47 2015
New Revision: 4384

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4384&view=rev
Log:
Have addSubcontext methods return the context added.

Modified:
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java

Modified: trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java?rev=4384&r1=4383&r2=4384&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java	(original)
+++ trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java	Thu Nov  5 12:35:47 2015
@@ -165,9 +165,11 @@
      * Add a subcontext to the current context.
      * 
      * @param subContext the subcontext to add
-     */
-    public void addSubcontext(@Nonnull final BaseContext subContext) {
-        addSubcontext(subContext, false);
+     * 
+     * @return the context added
+     */
+    @Nonnull public BaseContext addSubcontext(@Nonnull final BaseContext subContext) {
+        return addSubcontext(subContext, false);
     }
     
     /**
@@ -176,14 +178,15 @@
      * @param subcontext the subcontext to add
      * @param replace flag indicating whether to replace the existing instance of the subcontext if present
      * 
-     */
-    public void addSubcontext(@Nonnull final BaseContext subcontext, final boolean replace) {
+     * @return the context added
+     */
+    @Nonnull public BaseContext addSubcontext(@Nonnull final BaseContext subcontext, final boolean replace) {
         Constraint.isNotNull(subcontext, "Subcontext cannot be null");
         
         final BaseContext existing = subcontexts.get(subcontext.getClass());
         if (existing == subcontext) {
             log.trace("Subcontext to add is already a child of the current context, skipping");
-            return;
+            return subcontext;
         }
         
         // Note: This will throw if replace == false and existing != null.
@@ -215,6 +218,7 @@
             existing.setParent(null);
         }
         
+        return subcontext;
     }
     
     /**