Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #617 from andrewgaul/filesystem-transient-remove-copy" 

This reverts commit 0fe120d659, reversing
changes made to 5033b98252.
This commit is contained in:
Andrew Phillips 2012-05-08 23:37:19 -07:00
parent 0fe120d659
commit 29e7e7e85e
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java
View File

@ -246,7 +246,7 @@ public class FilesystemAsyncBlobStore extends BaseAsyncBlobStore {
storageStrategy.getAllContainerNames())); storageStrategy.getAllContainerNames()));
} }
private static MutableBlobMetadata copy(MutableBlobMetadata in) { public static MutableBlobMetadata copy(MutableBlobMetadata in) {
ByteArrayOutputStream bout = new ByteArrayOutputStream(); ByteArrayOutputStream bout = new ByteArrayOutputStream();
ObjectOutput os; ObjectOutput os;
try { try {
@ -271,6 +271,12 @@ public class FilesystemAsyncBlobStore extends BaseAsyncBlobStore {
metadata.setUserMetadata(lowerCaseUserMetadata); metadata.setUserMetadata(lowerCaseUserMetadata);
} }
public static MutableBlobMetadata copy(MutableBlobMetadata in, String newKey) {
MutableBlobMetadata newMd = copy(in);
newMd.setName(newKey);
return newMd;
}
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */

8
blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java
View File

@ -247,7 +247,7 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
storageStrategy.getAllContainerNames())); storageStrategy.getAllContainerNames()));
} }
private static MutableBlobMetadata copy(MutableBlobMetadata in) { public static MutableBlobMetadata copy(MutableBlobMetadata in) {
ByteArrayOutputStream bout = new ByteArrayOutputStream(); ByteArrayOutputStream bout = new ByteArrayOutputStream();
ObjectOutput os; ObjectOutput os;
try { try {
@ -271,6 +271,12 @@ public class TransientAsyncBlobStore extends BaseAsyncBlobStore {
metadata.setUserMetadata(lowerCaseUserMetadata); metadata.setUserMetadata(lowerCaseUserMetadata);
} }
public static MutableBlobMetadata copy(MutableBlobMetadata in, String newKey) {
MutableBlobMetadata newMd = copy(in);
newMd.setName(newKey);
return newMd;
}
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */