Merge branch '4.9' into 4.10

Author: yadvr

engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java

@@ -771,7 +771,7 @@ public long addTemplateToZone(VMTemplateVO tmplt, long zoneId) {
             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);
         }

framework/db/pom.xml

@@ -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>

framework/db/src/com/cloud/utils/db/GenericDaoBase.java

@@ -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 @@ protected void prepareAttribute(final int j, final PreparedStatement pstmt, fina
             }
         } 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;
             }