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

[Christian Bauer]

  User: cbauer  
  Date: 07/08/31 13:54:36

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/dao 
                        FeedDAO.java
  Log:
  Document deletion did not remove feed entry correctly
  
  Revision  Changes    Path
  1.15      +20 -0     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FeedDAO.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/FeedDAO.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- FeedDAO.java	25 Aug 2007 22:35:09 -0000	1.14
  +++ FeedDAO.java	31 Aug 2007 17:54:36 -0000	1.15
  @@ -48,6 +48,26 @@
                   .getResultList();
       }
   
  +    public void removeFeedEntry(Document document) {
  +        try {
  +            FeedEntry fe = (FeedEntry)
  +                    restrictedEntityManager.createQuery("select fe from FeedEntry fe where not fe.document is null and fe.document = :doc")
  +                .setParameter("doc", document)
  +                .getSingleResult();
  +            if (fe != null) {
  +                // Unlink feed entry from all feeds
  +                Set<Feed> feeds = getAvailableFeeds(document, true);
  +                for (Feed feed : feeds) {
  +                    log.debug("remove feed entry from feed: " + feed.getId());
  +                    feed.getFeedEntries().remove(fe);
  +                }
  +                log.debug("deleting feed entry");
  +                restrictedEntityManager.remove(fe);
  +            }
  +        } catch (EntityNotFoundException ex) {
  +        } catch (NoResultException ex) {}
  +    }
  +
       public Feed findFeed(Long feedId) {
           restrictedEntityManager.joinTransaction();
           try {