diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-11-08 22:15:21 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-11-08 22:15:21 -0800 |
| commit | 2697d6a4fbdc9d9d6f739badcaecca90e666dd99 (patch) | |
| tree | 4e8af4c316fb35fe545536cedfd1d4c9b0da1ff6 | |
| parent | 70008b093eddfe3173fc54e8a232c22daef9331f (diff) | |
| download | seaweedfs-2697d6a4fbdc9d9d6f739badcaecca90e666dd99.tar.xz seaweedfs-2697d6a4fbdc9d9d6f739badcaecca90e666dd99.zip | |
fix deleting bucket1.04
| -rw-r--r-- | other/java/s3copy/copier/src/main/java/com/seaweedfs/s3/PutObject.java | 7 | ||||
| -rw-r--r-- | weed/storage/volume_read_write.go | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/other/java/s3copy/copier/src/main/java/com/seaweedfs/s3/PutObject.java b/other/java/s3copy/copier/src/main/java/com/seaweedfs/s3/PutObject.java index 9095cd739..c310f0162 100644 --- a/other/java/s3copy/copier/src/main/java/com/seaweedfs/s3/PutObject.java +++ b/other/java/s3copy/copier/src/main/java/com/seaweedfs/s3/PutObject.java @@ -79,6 +79,13 @@ public class PutObject { // test deletes s3Client.deleteObject(bucketName, stringObjKeyName); + + // delete bucket + String tmpBucket = "tmpbucket"; + s3Client.createBucket(tmpBucket); + s3Client.putObject(tmpBucket, stringObjKeyName, stringContent); + s3Client.deleteBucket(tmpBucket); + } catch (AmazonServiceException e) { // The call was transmitted successfully, but Amazon S3 couldn't process // it, so it returned an error response. diff --git a/weed/storage/volume_read_write.go b/weed/storage/volume_read_write.go index 7644ec7fd..f68f6b559 100644 --- a/weed/storage/volume_read_write.go +++ b/weed/storage/volume_read_write.go @@ -42,7 +42,9 @@ func (v *Volume) Destroy() (err error) { } v.Close() os.Remove(v.FileName() + ".dat") - err = v.nm.Destroy() + if v.nm!=nil{ + err = v.nm.Destroy() + } os.Remove(v.FileName() + ".cpd") os.Remove(v.FileName() + ".cpx") os.Remove(v.FileName() + ".ldb") |