Skip to content

Commit e0f7c90

Browse files
---
yaml --- r: 28019 b: refs/heads/autosynth-vision c: 902874f h: refs/heads/master i: 28017: 82fb170 28015: 76c7c98
1 parent 743d5ea commit e0f7c90

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ refs/heads/autosynth-container: d17e1a76a903f9e05eba56a9bf5d12c1b15b67d7
116116
refs/heads/autosynth-monitoring: e66569bd7358a90d17097f90cf8c70dbeeb048cf
117117
refs/heads/autosynth-pubsub: 8aac5a6202d83e8d67f5cb1d58f0adf9f2622aeb
118118
refs/heads/autosynth-video-intelligence: 82b145665822830c46d47eb8925edb2d842d6815
119-
refs/heads/autosynth-vision: 909b0e8ef2d87a5d75da3ebfb595868a94645aae
119+
refs/heads/autosynth-vision: 902874ff124128a9bc4a27e2f43a5951c743215d
120120
refs/heads/spanner: b01127f885b4611bf1852abb0ce481eeb7fcc131
121121
refs/tags/v0.68.0: 9cc799fcf68c82ab431d425fefa58ef615ce8e5b
122122
refs/tags/v0.69.0: 78f67a29e8b9c46ba01de566a2eae0fd1c03edea

branches/autosynth-vision/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/CloudStoragePath.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@ boolean seemsLikeADirectoryAndUsePseudoDirectories(Storage storage) {
108108
this.bucket(),
109109
Storage.BlobListOption.prefix(prefix),
110110
// we only look at the first result, so no need for a bigger page.
111-
Storage.BlobListOption.pageSize(1));
111+
Storage.BlobListOption.pageSize(1),
112+
fileSystem.provider().getProject() == null
113+
? null
114+
: Storage.BlobListOption.userProject(fileSystem.provider().getProject()));
112115
for (Blob b : list.getValues()) {
113116
// if this blob starts with our prefix and then a slash, then prefix is indeed a folder!
114117
if (b.getBlobId() == null) {

branches/autosynth-vision/google-cloud-clients/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ public Tuple<String, Iterable<StorageObject>> list(String bucket, Map<Option, ?>
145145
case MAX_RESULTS:
146146
maxResults = (Long) e.getValue();
147147
break;
148+
case USER_PROJECT:
149+
// prevent unsupported operation
150+
break;
148151
default:
149152
throw new UnsupportedOperationException("Unknown option: " + e.getKey());
150153
}

0 commit comments

Comments
 (0)