Index: lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java,v diff -u -r1.1.10.1 -r1.1.10.2 --- lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java 28 Sep 2009 05:38:24 -0000 1.1.10.1 +++ lams_common/src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java 28 Sep 2009 05:44:14 -0000 1.1.10.2 @@ -3,7 +3,6 @@ import java.security.InvalidParameterException; import java.util.List; -import org.apache.axis.transport.jms.Subscription; import org.lamsfoundation.lams.events.Event; import org.lamsfoundation.lams.events.dao.EventDAO; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; @@ -14,7 +13,7 @@ + " AS e WHERE e.scope=? AND e.name=? AND e.eventSessionId=? AND e.failTime IS NULL"; protected static final String GET_EVENTS_TO_RESEND_QUERY = "SELECT DISTINCT e FROM " + Event.class.getName() - + " AS e, " + Subscription.class.getName() + " AS s WHERE s.event = e AND (e.failTime IS NOT NULL OR " + + " AS e, Subscription AS s WHERE s.event = e AND (e.failTime IS NOT NULL OR " + "(s.periodicity > 0 AND (NOW()- s.lastOperationTime >= s.periodicity)))"; public Event getEvent(String scope, String name, Long sessionId) throws InvalidParameterException {