[Join-cvs] join1/src/main/org/figure8/join/control/action LogicalEnvironmentActions.java, 1.1, 1.2

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/control/action
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2725/control/action

Modified Files:
	LogicalEnvironmentActions.java 
Log Message:
Fix for issues #2101967 and #2101959 : use the 'active' status when creating new logical environment and refresh correclty the environment cache when updating status

Index: LogicalEnvironmentActions.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/action/LogicalEnvironmentActions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LogicalEnvironmentActions.java	7 Jul 2006 22:20:46 -0000	1.1
--- LogicalEnvironmentActions.java	1 Nov 2008 00:44:05 -0000	1.2
***************
*** 142,146 ****
      * @throws Exception such as InfraStructureExceptions ...
      */
!    public ActionForward doExecute(String operation, ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception{
        // Trace operation to execute.
        log.debug("doExecute() called for '" + operation + "' operation");
--- 142,147 ----
      * @throws Exception such as InfraStructureExceptions ...
      */
!    public ActionForward doExecute(String operation, ActionMapping mapping, ActionForm form,
!                                   HttpServletRequest request, HttpServletResponse response) throws Exception{
        // Trace operation to execute.
        log.debug("doExecute() called for '" + operation + "' operation");
***************
*** 170,175 ****
      * @return A forward to the next view to render and display
      */
!    protected ActionForward loadEnvironment(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!       throws Exception{
  
        if (form instanceof LogicalEnvironmentForm){
--- 171,176 ----
      * @return A forward to the next view to render and display
      */
!    protected ActionForward loadEnvironment(ActionMapping mapping, ActionForm form,
!                                            HttpServletRequest request, HttpServletResponse response) throws Exception{
  
        if (form instanceof LogicalEnvironmentForm){
***************
*** 200,205 ****
      * @return A forward to the next view to render and display
      */
!    protected ActionForward saveEnvironment(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!            throws Exception{
  
        if (form instanceof LogicalEnvironmentForm){
--- 201,206 ----
      * @return A forward to the next view to render and display
      */
!    protected ActionForward saveEnvironment(ActionMapping mapping, ActionForm form,
!                                            HttpServletRequest request, HttpServletResponse response) throws Exception{
  
        if (form instanceof LogicalEnvironmentForm){
***************
*** 217,221 ****
           if (environment == null){
              log.info("Creation of a new LogicalEnvironment with key: " + envForm.getKey());
!             environment = new LogicalEnvironment(envForm.getKey(), envForm.getLabel(), envForm.getDescription(), envForm.getManagerId(), step, release);
           }
           else{
--- 218,224 ----
           if (environment == null){
              log.info("Creation of a new LogicalEnvironment with key: " + envForm.getKey());
!             environment = new LogicalEnvironment(envForm.getKey(), envForm.getLabel(), envForm.getDescription(),
!                     envForm.getManagerId(), step, release);
!             environment.setActive(envForm.isActive());
           }
           else{
***************
*** 234,239 ****
           }
           // Update environment in cache.
!          EnvironmentView view = environmentManager.getEnvironmentView(environment);
!          environmentViews.put(environment.getKey(), view);
  
           // Remove form and session attribute if present.
--- 237,243 ----
           }
           // Update environment in cache.
!          LogicalEnvironment refreshedEnvironment = environmentManager.getLogicalEnvironment(environment.getId());
!          EnvironmentView view = environmentManager.getEnvironmentView(refreshedEnvironment);
!          environmentViews.put(refreshedEnvironment.getKey(), view);
  
           // Remove form and session attribute if present.