You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/08/09 17:59:08 UTC
[1/3] airavata git commit: Fixed NPE with reservataion start time and
end time
Repository: airavata
Updated Branches:
refs/heads/develop 388d90a83 -> 0e14f97fd
Fixed NPE with reservataion start time and end time
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/876a1405
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/876a1405
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/876a1405
Branch: refs/heads/develop
Commit: 876a1405c7998cd713c3360283c184640c672404
Parents: a4716a7
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Aug 9 13:57:29 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Aug 9 13:57:29 2016 -0400
----------------------------------------------------------------------
.../core/app/catalog/util/AppCatalogThriftConversion.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/876a1405/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 @@ public class AppCatalogThriftConversion {
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;
}
[2/3] airavata git commit: Merge branch 'master' into develop
Posted by sh...@apache.org.
Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7ce90c54
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7ce90c54
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7ce90c54
Branch: refs/heads/develop
Commit: 7ce90c54edf34742a6b39871fc6099610365ab4a
Parents: f88859b 876a140
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Aug 9 13:58:22 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Aug 9 13:58:22 2016 -0400
----------------------------------------------------------------------
.../core/app/catalog/util/AppCatalogThriftConversion.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/3] airavata git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata into develop
Posted by sh...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0e14f97f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0e14f97f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0e14f97f
Branch: refs/heads/develop
Commit: 0e14f97fdd8ad0ad2b96df25856e8ebacab94ad1
Parents: 7ce90c5 388d90a
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Aug 9 13:58:53 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Aug 9 13:58:53 2016 -0400
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 3 +
.../api/server/util/ReplicaCatalogInitUtil.java | 160 +
.../lib/airavata/workspace_model_types.cpp | 44 +
.../lib/airavata/workspace_model_types.h | 20 +-
.../lib/Airavata/Model/Workspace/Types.php | 46 +
.../apache/airavata/model/workspace/ttypes.py | 28 +-
.../airavata/model/workspace/Gateway.java | 220 +-
.../main/resources/bin/airavata-server-start.sh | 3 +-
.../main/resources/airavata-server.properties | 9 +
modules/registry/pom.xml | 1 +
.../catalog/impl/GatewayRegistry.java | 4 +
.../core/experiment/catalog/model/Gateway.java | 20 +
.../catalog/resources/GatewayResource.java | 22 +
.../experiment/catalog/resources/Utils.java | 2 +
.../utils/ThriftDataModelConversion.java | 2 +
modules/registry/registry-server/pom.xml | 28 +
.../registry-api-service/pom.xml | 48 +
.../registry/api/service/RegistryAPIServer.java | 163 +
.../service/handler/RegistryServerHandler.java | 1677 +
.../api/service/util/AppCatalogInitUtil.java | 168 +
.../api/service/util/ConnectionPool.java | 383 +
.../registry/api/service/util/Constants.java | 29 +
.../api/service/util/DatabaseCreator.java | 353 +
.../service/util/ExperimentCatalogInitUtil.java | 203 +
.../registry/api/service/util/JdbcStorage.java | 176 +
.../service/util/ReplicaCatalogInitUtil.java | 160 +
.../service/util/WorkflowCatalogInitUtil.java | 160 +
.../registry-server/registry-api-stubs/pom.xml | 28 +
.../airavata/registry/api/RegistryService.java | 136899 ++++++++++++++++
.../api/exception/RegistryServiceException.java | 407 +
.../registry/api/registry_apiConstants.java | 57 +
.../org/apache/airavata/server/ServerMain.java | 33 +-
.../component-cpis/generate-cpi-stubs.sh | 10 +-
.../component-cpis/registry-api.thrift | 2072 +
.../component-cpis/registry_api_errors.thrift | 32 +
.../workspace_model.thrift | 4 +-
36 files changed, 143653 insertions(+), 21 deletions(-)
----------------------------------------------------------------------