apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.9' into 4.10

Browse Source
This commit is contained in:
Rohit Yadav 2017-07-26 15:18:42 +02:00
commit c1f30d954b
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
View File

@ -771,7 +771,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase<VMTemplateVO, Long> implem
tmpltZoneVO = new VMTemplateZoneVO(zoneId, tmplt.getId(), new Date());
_templateZoneDao.persist(tmpltZoneVO);
} else {
tmpltZoneVO.setRemoved(null);
tmpltZoneVO.setRemoved(GenericDaoBase.DATE_TO_NULL);
tmpltZoneVO.setLastUpdated(new Date());
_templateZoneDao.update(tmpltZoneVO.getId(), tmpltZoneVO);
}

2
framework/db/pom.xml
View File

@ -11,7 +11,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>cloud-framework-db</artifactId>
<name>Apache CloudStack Framework - Event Notification</name>
<name>Apache CloudStack Framework - Database</name>
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-framework</artifactId>

3
framework/db/src/com/cloud/utils/db/GenericDaoBase.java
View File

@ -158,6 +158,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
protected static final String FOR_UPDATE_CLAUSE = " FOR UPDATE ";
protected static final String SHARE_MODE_CLAUSE = " LOCK IN SHARE MODE";
protected static final String SELECT_LAST_INSERT_ID_SQL = "SELECT LAST_INSERT_ID()";
public static final Date DATE_TO_NULL = new Date(Long.MIN_VALUE);
protected static final SequenceFetcher s_seqFetcher = SequenceFetcher.getInstance();
@ -1537,7 +1538,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
}
} else if (attr.field.getType() == Date.class) {
final Date date = (Date)value;
if (date == null) {
if (date == null || date.equals(DATE_TO_NULL)) {
pstmt.setObject(j, null);
return;
}