[jboss-svn-commits] JBL Code SVN: r6807 - labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl

[jboss-svn-commits at lists.jboss.org]

Author: unibrew
Date: 2006-10-14 16:43:26 -0400 (Sat, 14 Oct 2006)
New Revision: 6807

Modified:
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
Log:
[JBFORUMS-134] Removing significant bug in ForumsModuleImpl in usage of Hibernate entities.

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2006-10-14 20:28:15 UTC (rev 6806)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2006-10-14 20:43:26 UTC (rev 6807)
@@ -266,8 +266,7 @@
       {
          Session session = getSession();
          Query query = session.createQuery("from CategoryImpl as c order by c.order asc");
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -284,8 +283,7 @@
       {
          Session session = getSession();
          Query query = session.createQuery("from ForumImpl as f order by f.order asc");
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -305,8 +303,7 @@
             session.createQuery("from ForumImpl as f where f.category=:categoryId order by f.order asc");
          query.setString("categoryId",
             categoryId.toString());
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -326,8 +323,7 @@
             session.createQuery("from TopicImpl as t where t.forum=:forumid and t.type = :type order by t.lastPostDate");
          query.setString("forumid", "" + forum.getId());
          query.setString("type", "" + ForumsConstants.POST_ANNOUNCE);
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -344,8 +340,7 @@
          Session session = getSession();
          Query query =
             session.createQuery("from TopicImpl");
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -373,8 +368,7 @@
          query.setMaxResults(perPage);
          query.setString("forumid", "" + forum.getId());
          query.setString("type", "" + type);
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -425,8 +419,7 @@
             session.createQuery("from TopicImpl as t where t.replies > :replies order by t.lastPostDate desc");
          query.setMaxResults(limit);
          query.setInteger("replies", replies);
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -447,8 +440,7 @@
          Query query =
             session.createQuery("from TopicImpl as t order by t.lastPostDate desc");
          query.setMaxResults(limit);
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -469,8 +461,7 @@
             session.createQuery("from TopicImpl as t where t.lastPostDate > :after order by t.replies desc");
          query.setMaxResults(limit);
          query.setDate("after", after);
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -491,8 +482,7 @@
             session.createQuery("from TopicImpl as t where t.lastPostDate > :after order by t.viewCount desc");
          query.setMaxResults(limit);
          query.setDate("after", after);
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -924,8 +914,7 @@
             Query query =
                session.createQuery("from TopicImpl as t where t.forum = :forumid");
             query.setString("forumid", "" + forum.getId());
-            Iterator iterator = query.iterate();
-            return Tools.toList(iterator);
+            return query.list();
          }
          catch (HibernateException e)
          {
@@ -948,8 +937,7 @@
          Session session = getSession();
          Query query =
             session.createQuery("from PostImpl");
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -1035,8 +1023,7 @@
          {
             query.setMaxResults(limit);
          }
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -1056,8 +1043,7 @@
             session.createQuery("from PostImpl as p where p.topic=:topicId");
          query.setString("topicId",
             topicId.toString());
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {
@@ -1187,8 +1173,7 @@
          Session session = getSession();
          Query query = session.createQuery("from ForumWatchImpl as f where f.poster.userId = :userId");
          query.setString("userId", user.getId().toString());
-         Iterator iterator = query.iterate();
-         return Tools.toList(iterator);
+         return query.list();
       }
       catch (HibernateException e)
       {