You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/10/26 10:41:57 UTC
[1/2] brooklyn-server git commit: add exist check before getting the
blob
Repository: brooklyn-server
Updated Branches:
refs/heads/master 34eab1776 -> d8adb37bf
add exist check before getting the blob
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6f6f3703
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6f6f3703
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/6f6f3703
Branch: refs/heads/master
Commit: 6f6f370309ed1bbd479d193cdc34f8afc25589ee
Parents: 34eab17
Author: Andrea Turli <an...@gmail.com>
Authored: Wed Oct 26 12:31:38 2016 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Wed Oct 26 12:35:35 2016 +0200
----------------------------------------------------------------------
.../core/mgmt/persist/jclouds/JcloudsStoreObjectAccessor.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6f6f3703/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsStoreObjectAccessor.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsStoreObjectAccessor.java b/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsStoreObjectAccessor.java
index be6a56e..bc64b84 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsStoreObjectAccessor.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsStoreObjectAccessor.java
@@ -89,6 +89,7 @@ public class JcloudsStoreObjectAccessor implements PersistenceObjectStore.StoreO
@Override
public String get() {
try {
+ if (!blobStore.blobExists(containerName, blobName)) return null;
Blob blob = blobStore.getBlob(containerName, blobName);
if (blob==null) return null;
return Strings2.toStringAndClose(blob.getPayload().openStream());
[2/2] brooklyn-server git commit: This closes #394
Posted by he...@apache.org.
This closes #394
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d8adb37b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d8adb37b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d8adb37b
Branch: refs/heads/master
Commit: d8adb37bfa8dd41ed56367beb9ed4ad2d8aa1ed9
Parents: 34eab17 6f6f370
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 26 11:41:43 2016 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 26 11:41:43 2016 +0100
----------------------------------------------------------------------
.../core/mgmt/persist/jclouds/JcloudsStoreObjectAccessor.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------