Skip to content

Commit ed9c55c

Browse files
aozarovaozarov
committed
---
yaml --- r: 1755 b: refs/heads/master c: 36ebabd h: refs/heads/master i: 1753: d4bb893 1751: ddd10c8
1 parent aa6f3f9 commit ed9c55c

5 files changed

Lines changed: 33 additions & 16 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: cded23436465bb5fb1233eb5cd6740b4561357f9
2+
refs/heads/master: 36ebabda8ae8f075e5b83128344c5a92c84c3715
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: d1b373c30c176edc08692348167bec3a244bb823
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3

‎trunk/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,17 @@ public BaseServiceException(IOException exception, boolean idempotent) {
9797
String debugInfo = null;
9898
if (exception instanceof GoogleJsonResponseException) {
9999
GoogleJsonError jsonError = ((GoogleJsonResponseException) exception).getDetails();
100-
Error error = error(jsonError);
101-
code = error.code;
102-
reason = error.reason;
103-
if (reason != null) {
104-
GoogleJsonError.ErrorInfo errorInfo = jsonError.getErrors().get(0);
105-
location = errorInfo.getLocation();
106-
debugInfo = (String) errorInfo.get("debugInfo");
100+
if (jsonError != null) {
101+
Error error = error(jsonError);
102+
code = error.code;
103+
reason = error.reason;
104+
if (reason != null) {
105+
GoogleJsonError.ErrorInfo errorInfo = jsonError.getErrors().get(0);
106+
location = errorInfo.getLocation();
107+
debugInfo = (String) errorInfo.get("debugInfo");
108+
}
109+
} else {
110+
code = ((GoogleJsonResponseException) exception).getStatusCode();
107111
}
108112
}
109113
this.code = code;
@@ -207,7 +211,10 @@ protected static Error error(GoogleJsonError error) {
207211

208212
protected static String message(IOException exception) {
209213
if (exception instanceof GoogleJsonResponseException) {
210-
return ((GoogleJsonResponseException) exception).getDetails().getMessage();
214+
GoogleJsonError details = ((GoogleJsonResponseException) exception).getDetails();
215+
if (details != null) {
216+
return details.getMessage();
217+
}
211218
}
212219
return exception.getMessage();
213220
}

‎trunk/gcloud-java-storage/src/main/java/com/google/gcloud/spi/DefaultStorageRpc.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import static com.google.gcloud.spi.StorageRpc.Option.PREFIX;
3232
import static com.google.gcloud.spi.StorageRpc.Option.VERSIONS;
3333
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
34+
import static javax.servlet.http.HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE;
3435

3536
import com.google.api.client.googleapis.batch.json.JsonBatchCallback;
3637
import com.google.api.client.googleapis.json.GoogleJsonError;
@@ -453,7 +454,11 @@ public Tuple<String, byte[]> read(StorageObject from, Map<Option, ?> options, lo
453454
String etag = req.getLastResponseHeaders().getETag();
454455
return Tuple.of(etag, output.toByteArray());
455456
} catch (IOException ex) {
456-
throw translate(ex);
457+
StorageException serviceException = translate(ex);
458+
if (serviceException.code() == SC_REQUESTED_RANGE_NOT_SATISFIABLE) {
459+
return Tuple.of(null, new byte[0]);
460+
}
461+
throw serviceException;
457462
}
458463
}
459464

‎trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobReadChannel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public Tuple<String, byte[]> call() {
127127
return storageRpc.read(storageObject, requestOptions, position, toRead);
128128
}
129129
}, serviceOptions.retryParams(), StorageImpl.EXCEPTION_HANDLER);
130-
if (lastEtag != null && !Objects.equals(result.x(), lastEtag)) {
130+
if (result.y().length > 0 && lastEtag != null && !Objects.equals(result.x(), lastEtag)) {
131131
StringBuilder messageBuilder = new StringBuilder();
132132
messageBuilder.append("Blob ").append(blob).append(" was updated while reading");
133133
throw new StorageException(0, messageBuilder.toString());

‎trunk/gcloud-java-storage/src/test/java/com/google/gcloud/storage/it/ITStorageTest.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import org.junit.Test;
5555

5656
import java.io.ByteArrayInputStream;
57+
import java.io.ByteArrayOutputStream;
5758
import java.io.IOException;
5859
import java.io.InputStream;
5960
import java.net.URL;
@@ -834,14 +835,18 @@ public void testReadAndWriteChannelsWithDifferentFileSize() throws IOException {
834835
byte[] bytes = new byte[blobSize];
835836
rnd.nextBytes(bytes);
836837
try (WriteChannel writer = storage.writer(blob)) {
837-
writer.write(ByteBuffer.wrap(BLOB_BYTE_CONTENT));
838+
writer.write(ByteBuffer.wrap(bytes));
838839
}
839-
ByteBuffer readBytes;
840+
ByteArrayOutputStream output = new ByteArrayOutputStream();
840841
try (ReadChannel reader = storage.reader(blob.blobId())) {
841-
readBytes = ByteBuffer.allocate(BLOB_BYTE_CONTENT.length);
842-
reader.read(readBytes);
842+
ByteBuffer buffer = ByteBuffer.allocate(64 * 1024);
843+
while (reader.read(buffer) > 0) {
844+
buffer.flip();
845+
output.write(buffer.array(), 0, buffer.limit());
846+
buffer.clear();
847+
}
843848
}
844-
assertArrayEquals(BLOB_BYTE_CONTENT, readBytes.array());
849+
assertArrayEquals(bytes, output.toByteArray());
845850
assertTrue(storage.delete(BUCKET, blobName));
846851
}
847852
}

0 commit comments

Comments
 (0)