You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/18 13:30:27 UTC
[36/50] git commit: [KARAF-2286] - Cellar-Cloud: If the configured
store contains unknown Blob this causes unpleasant exceptions
[KARAF-2286] - Cellar-Cloud: If the configured store contains unknown Blob this causes unpleasant exceptions
git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.2.x@1470411 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/01045853
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/01045853
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/01045853
Branch: refs/heads/cellar-2.2.x
Commit: 01045853e6208db000bb939ee514c4ff1a98e019
Parents: da92f52
Author: anierbeck <an...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Mon Apr 22 08:49:35 2013 +0000
Committer: anierbeck <an...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Mon Apr 22 08:49:35 2013 +0000
----------------------------------------------------------------------
.../org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/01045853/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
----------------------------------------------------------------------
diff --git a/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java b/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
index bad1917..169364d 100644
--- a/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
+++ b/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
@@ -43,6 +43,7 @@ public class BlobStoreDiscoveryService implements DiscoveryService {
private static final String KARAF_CELLAR = "Karaf-Cellar";
private static final String APPLICATION_TYPE = "Application-Type";
+ private static final String X_AMZ_META_APPLICATION_TYPE = "x-amz-meta-application-type";
private static final transient Logger LOGGER = LoggerFactory.getLogger(BlobStoreDiscoveryService.class);
@@ -108,7 +109,8 @@ public class BlobStoreDiscoveryService implements DiscoveryService {
String ip = md.getName();
Map<String, String> userMetadata = md.getUserMetadata();
Object obj = null;
- if (userMetadata.containsKey(APPLICATION_TYPE) && KARAF_CELLAR.equalsIgnoreCase(userMetadata.get(APPLICATION_TYPE))) {
+ //x-amz-meta-application-type
+ if (userMetadata.containsKey(X_AMZ_META_APPLICATION_TYPE) && KARAF_CELLAR.equalsIgnoreCase(userMetadata.get(X_AMZ_META_APPLICATION_TYPE))) {
obj = readBlob(container, ip);
} else {
LOGGER.debug("CELLAR CLOUD: found blob of unknown Application-Type, will be skipped!");