xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge tag 'OB_14.4.1-33' into omaha_14.4.1

Browse source 
14.4.1-33


Former-commit-id: 40660158ab [formerly 165f28211d [formerly c97ae8555c08e5394c536a42e1b25e0c47a310aa]]
Former-commit-id: 165f28211d
Former-commit-id: 3e0f89c5d0
This commit is contained in:
Steve Harris 2015-05-05 13:18:29 -05:00
commit d0c9b22d97
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
View file

@ -107,6 +107,7 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery;
* 06/12/14 #3244 randerso Improved error handling
* 09/21/2014 #3648 randerso Changed to do version purging when new databases are added
* 10/16/2014 3454 bphillip Upgrading to Hibernate 4
* 04/28/2015 17435 randerso Fix getLatestDbIdByModelName().
*
* </pre>
*
@ -1372,7 +1373,8 @@ public class GFEDao extends DefaultPluginDao {
public List<DatabaseID> doInTransaction(
TransactionStatus status) {
Query query = getCurrentSession().createQuery("FROM DatabaseID WHERE siteId = :siteId AND modelName = :modelName ORDER BY modelTime DESC LIMIT 1");
Query query = getCurrentSession().createQuery("FROM DatabaseID WHERE siteId = :siteId AND modelName = :modelName ORDER BY modelTime DESC");
query.setMaxResults(1);
query.setParameter("siteId", siteId);
query.setParameter("modelName",modelName);
return query.list();

2
edexOsgi/com.raytheon.uf.common.dataplugin.obs/META-INF/MANIFEST.MF
View file

@ -14,4 +14,6 @@ Require-Bundle: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.geospatial,
com.raytheon.uf.common.serialization,
com.raytheon.uf.common.dataaccess,
com.raytheon.uf.common.message,
javax.measure
Eclipse-RegisterBuddy: com.raytheon.uf.common.message