commit 876a1405c7998cd713c3360283c184640c672404
author Shameera Rathnayaka <shameerainfo@gmail.com> Tue Aug 09 13:57:29 2016 -0400
committer Shameera Rathnayaka <shameerainfo@gmail.com> Tue Aug 09 13:57:29 2016 -0400
tree b2fb978a0dd0b75b8bf0dd19d1759b57e397a457
parent a4716a7b3bdf07645370117edc0b9484d3308dab

Fixed NPE with reservataion start time and end time

modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java

diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
index 4d73ac6..8b40d62 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
@@ -834,8 +834,13 @@
         preference.setUsageReportingGatewayId(resource.getGatewayId());
         preference.setQualityOfService(resource.getQualityOfService());
         preference.setReservation(resource.getReservation());
-        preference.setReservationStartTime(resource.getReservationStartTime().getTime());
-        preference.setReservationEndTime(resource.getReservationEndTime().getTime());
+        if (resource.getReservationStartTime() != null) {
+            preference.setReservationStartTime(resource.getReservationStartTime().getTime());
+        }
+
+        if (resource.getReservationEndTime() != null) {
+            preference.setReservationEndTime(resource.getReservationEndTime().getTime());
+        }
         return preference;
     }