[jboss-cvs] jboss-portal/cms/src/main/org/jboss/portal/cms/hibernate ...

[Julien Viet]

  User: julien  
  Date: 06/07/17 09:11:25

  Modified:    cms/src/main/org/jboss/portal/cms/hibernate 
                        HibernateStore.java
  Log:
  fix cms tests
  
  Revision  Changes    Path
  1.24      +26 -15    jboss-portal/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HibernateStore.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- HibernateStore.java	11 Jul 2006 13:16:25 -0000	1.23
  +++ HibernateStore.java	17 Jul 2006 13:11:25 -0000	1.24
  @@ -274,9 +274,20 @@
         }
         finally
         {
  +         closeSession(session);
  +      }
  +   }
  +
  +   private void closeSession(Session session)
  +   {
  +      if (session != null)
  +      {
  +         if (session.isOpen())
  +         {
            session.close();
         }
      }
  +   }
   
   
      /**
  @@ -364,7 +375,7 @@
         }
         finally
         {
  -         session.close();
  +         closeSession(session);
         }
      }
   
  @@ -406,7 +417,7 @@
         }
         finally
         {
  -         session.close();
  +         closeSession(session);
         }
         return false;
      }
  @@ -450,7 +461,7 @@
         }
         finally
         {
  -         session.close();
  +         closeSession(session);
         }
      }
   
  @@ -493,7 +504,7 @@
         }
         finally
         {
  -         session.close();
  +         closeSession(session);
         }
      }
   
  @@ -536,7 +547,7 @@
         }
         finally
         {
  -         session.close();
  +         closeSession(session);
         }
      }
   
  @@ -579,7 +590,7 @@
         }
         finally
         {
  -         session.close();
  +         closeSession(session);
         }
      }
   
  @@ -629,7 +640,7 @@
         }
         finally
         {
  -         session.close();
  +         closeSession(session);
         }
      }
   
  @@ -892,7 +903,7 @@
         }
         finally
         {
  -         session.close();
  +         closeSession(session);
         }
      }
   
  @@ -1010,7 +1021,7 @@
                        }
                        finally
                        {
  -                        session.close();
  +                        closeSession(session);
                        }
                     }
                     else  // create new
  @@ -1048,7 +1059,7 @@
                        }
                        finally
                        {
  -                        session.close();
  +                        closeSession(session);
                        }
                     }
                  }
  @@ -1215,7 +1226,7 @@
                        }
                        finally
                        {
  -                        session.close();
  +                        closeSession(session);
                        }
                     }
                     else
  @@ -1253,7 +1264,7 @@
                        }
                        finally
                        {
  -                        session.close();
  +                        closeSession(session);
                        }
                     }
                  }
  @@ -1456,7 +1467,7 @@
         }
         finally
         {
  -         session.close();
  +         closeSession(session);
         }
   
         // the root entry doesn't exist yet, create it...
  @@ -1518,7 +1529,7 @@
         }
         finally
         {
  -        session.close();
  +         closeSession(session);
         }
      }