dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5909
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-02-10 12:48:09 +0100
message:
  Reverted 5908
modified:
  dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java	2012-02-10 08:25:18 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java	2012-02-10 11:48:09 +0000
@@ -27,9 +27,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.Collection;
-import java.util.List;
-
 import org.hibernate.Criteria;
 import org.hibernate.Query;
 import org.hibernate.SQLQuery;
@@ -38,12 +35,13 @@
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
-import org.hisp.dhis.cache.HibernateCacheManager;
 import org.hisp.dhis.common.GenericNameableObjectStore;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+import java.util.Collection;
+import java.util.List;
+
 /**
  * @author Lars Helge Overland
  * @version $Id$
@@ -66,9 +64,6 @@
         this.jdbcTemplate = jdbcTemplate;
     }
 
-    @Autowired
-    protected HibernateCacheManager cacheManager;
-
     private Class<T> clazz;
 
     /**
@@ -112,7 +107,7 @@
 
     /**
      * Creates a Query.
-     * 
+     *
      * @param hql the hql query.
      * @return a Query instance.
      */
@@ -123,7 +118,7 @@
 
     /**
      * Creates a SqlQuery.
-     * 
+     *
      * @param sql the sql query.
      * @return a SqlQuery instance.
      */
@@ -136,7 +131,7 @@
 
     /**
      * Creates a Critera for the implementation Class type.
-     * 
+     *
      * @return a Criteria instance.
      */
     protected final Criteria getCriteria()
@@ -152,7 +147,7 @@
     /**
      * Creates a Criteria for the implementation Class type restricted by the
      * given Criterions.
-     * 
+     *
      * @param expressions the Criterions for the Criteria.
      * @return a Criteria instance.
      */
@@ -170,7 +165,7 @@
 
     /**
      * Retrieves an object based on the given Criterions.
-     * 
+     *
      * @param expressions the Criterions for the Criteria.
      * @return an object of the implementation Class type.
      */
@@ -182,7 +177,7 @@
 
     /**
      * Retrieves a List based on the given Criterions.
-     * 
+     *
      * @param expressions the Criterions for the Criteria.
      * @return a List with objects of the implementation Class type.
      */
@@ -276,7 +271,6 @@
     public final void delete( T object )
     {
         sessionFactory.getCurrentSession().delete( object );
-        cacheManager.clearCache();
     }
 
     @Override