You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2013/04/22 10:49:35 UTC
svn commit: r1470411 -
/karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
Author: anierbeck
Date: Mon Apr 22 08:49:35 2013
New Revision: 1470411
URL: http://svn.apache.org/r1470411
Log:
[KARAF-2286] - Cellar-Cloud: If the configured store contains unknown Blob this causes unpleasant exceptions
Modified:
karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
Modified: karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java?rev=1470411&r1=1470410&r2=1470411&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java Mon Apr 22 08:49:35 2013
@@ -43,6 +43,7 @@ public class BlobStoreDiscoveryService i
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 i
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!");