[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/preferences ...

[Christian Bauer]

  User: cbauer  
  Date: 07/09/25 10:30:45

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/preferences 
                        WikiPreferenceProvider.java
  Log:
  Recommending upgrade of JBoss-bundled Hibernate instead of deploying our own (which caused weird conflicts at runtime)
  
  Revision  Changes    Path
  1.5       +0 -5      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiPreferenceProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/preferences/WikiPreferenceProvider.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- WikiPreferenceProvider.java	24 Sep 2007 08:23:20 -0000	1.4
  +++ WikiPreferenceProvider.java	25 Sep 2007 14:30:45 -0000	1.5
  @@ -37,7 +37,6 @@
   
       public Set<PreferenceValue> load(PreferenceComponent component, Object user, Object instance, boolean includeSystemPreferences) {
           log.debug("Loading preference values for component '" + component.getName() + "' and user '" + user + "' and instance '" + instance + "'");
  -        entityManager.joinTransaction();
   
           if (currentValueMap.get(component) != null) {
               log.debug("Returning cached preference values of current conversation");
  @@ -63,7 +62,6 @@
   
       public Set<PreferenceValue> store(PreferenceComponent component, Set<PreferenceValue> valueHolders, Object user, Object instance) {
           log.debug("Storing preference values for component '" + component.getName() + "' and user '" + user + "' and instance '" + instance + "'");
  -        entityManager.joinTransaction();
   
           currentValueMap.put(component, new TreeSet<PreferenceValue>());
   
  @@ -112,7 +110,6 @@
   
       public void deleteUserPreferences(Object user) {
           log.debug("Deleting all preference values of user '" + user + "'");
  -        entityManager.joinTransaction();
           entityManager.createQuery("delete from WikiPreferenceValue wp where wp.user = :user and wp.node is null")
                   .setParameter("user", user)
                   .executeUpdate();
  @@ -120,7 +117,6 @@
   
       public void deleteInstancePreferences(Object instance) {
           log.debug("Deleting all preference values of instance '" + instance + "'");
  -        entityManager.joinTransaction();
           entityManager.createQuery("delete from WikiPreferenceValue wp where wp.user is null and wp.node = :node")
                   .setParameter("node", instance)
                   .executeUpdate();
  @@ -128,7 +124,6 @@
   
       public void flush() {
           log.debug("Flushing queued preference values of this conversation to the database");
  -        entityManager.joinTransaction();
   
           // Persist new values (we need to do this during final flush because otherwise we have the persist()/identity generator problem
           for (PreferenceValue queuedNewValue : queuedNewValues) {