Changeset 3858

Timestamp:

Oct 17, 2007, 7:15:57 PM (14 years ago)

Author:

Nicklas Nordborg

Message:

References #794: Additional fix needed in trunk due to API changes in 2.4-stable

Location:

trunk/src/core/net/sf/basedb/core

Files:

• RawDataTypes.java (modified) (2 diffs)
• Update.java (modified) (4 diffs)

trunk/src/core/net/sf/basedb/core/RawDataTypes.java

@@ -113 +113 @@
       org.hibernate.Query query = HibernateUtil.createQuery(session, 
         "FROM PlatformData pfd WHERE pfd.fileOnly = true");
-      for (PlatformData platform : HibernateUtil.loadList(PlatformData.class, query))
+      for (PlatformData platform : HibernateUtil.loadList(PlatformData.class, query, null))
       {
         RawDataType rdt = new RawDataType(platform);
@@ -122 +122 @@
       query = HibernateUtil.createQuery(session, 
         "FROM PlatformVariantData pfv WHERE pfv.fileOnly = true");
-      for (PlatformVariantData variant : HibernateUtil.loadList(PlatformVariantData.class, query))
+      for (PlatformVariantData variant : HibernateUtil.loadList(PlatformVariantData.class, query, null))
       {
         RawDataType rdt = new RawDataType(variant);

trunk/src/core/net/sf/basedb/core/Update.java

@@ -1696 +1696 @@
         "SELECT ad FROM ArrayDesignData ad WHERE ad.platform is null");
       List<ArrayDesignData> arrayDesigns = 
-        HibernateUtil.loadList(ArrayDesignData.class, designQuery);
+        HibernateUtil.loadList(ArrayDesignData.class, designQuery, sc);
       for (ArrayDesignData dd : arrayDesigns)
       {
@@ -1732 +1732 @@
         "SELECT rba FROM RawBioAssayData rba WHERE rba.platform is null");
       List<RawBioAssayData> rawBioAssays = 
-        HibernateUtil.loadList(RawBioAssayData.class, rbaQuery);
+        HibernateUtil.loadList(RawBioAssayData.class, rbaQuery, sc);
       for (RawBioAssayData dd : rawBioAssays)
       {
@@ -1785 +1785 @@
       query.setString("name", "raw_data_type");
       query.setString("value", "affymetrix");
-      List<ProjectData> projects = HibernateUtil.loadList(ProjectData.class, query);
+      List<ProjectData> projects = HibernateUtil.loadList(ProjectData.class, query, sc);
       for (ProjectData project : projects)
       {
@@ -1829 +1829 @@
       pQuery.setParameterList("keys", 
         Arrays.asList( new Integer[] { adKeyId, rbaKeyId }), Type.INT.getHibernateType());
-      List<Integer> pluginIds = HibernateUtil.loadList(Integer.class, pQuery);
+      List<Integer> pluginIds = HibernateUtil.loadList(Integer.class, pQuery, sc);
       for (int pluginId : pluginIds)
       {