Fix to issue found by KevinC where a wizard launched in the "plain" container would revert to default container after first page displayed.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6229 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java

@@ -90,6 +90,10 @@ public abstract class BaseDialogBean implements IDialogBean
    
    public String cancel()
    {
+      // remove container variable
+      FacesContext.getCurrentInstance().getExternalContext().getSessionMap().remove(
+                AlfrescoNavigationHandler.EXTERNAL_CONTAINER_SESSION);
+      
       return getDefaultCancelOutcome();
    }
    
@@ -122,6 +126,10 @@ public abstract class BaseDialogBean implements IDialogBean
             // allow any subclasses to perform post commit processing 
             // i.e. resetting state or setting status messages
             outcome = doPostCommitProcessing(context, outcome);
+            
+            // remove container variable
+            context.getExternalContext().getSessionMap().remove(
+                    AlfrescoNavigationHandler.EXTERNAL_CONTAINER_SESSION);
          }
          catch (Throwable e)
          {