Skip to content

Commit e9c9b2b

Browse files
---
yaml --- r: 35847 b: refs/heads/autosynth-dataproc c: 902874f h: refs/heads/master i: 35845: 3db6685 35843: adddbfa 35839: f513d85
1 parent 3657ac8 commit e9c9b2b

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
@@ -165,7 +165,7 @@ refs/tags/v0.78.0: 62d4bd30605ab3578f9a08d84487fb0b33ac2ff5
165165
refs/tags/v0.79.0: 82287b570708748c411d05c40f3932cff9606feb
166166
refs/tags/v0.80.0: f745e744d38e4fe636f34d0e04795ba3d014287d
167167
refs/tags/v0.81.0: ed3a0c85339ea6b73560b9a570abfbb76b93a263
168-
refs/heads/autosynth-dataproc: 909b0e8ef2d87a5d75da3ebfb595868a94645aae
168+
refs/heads/autosynth-dataproc: 902874ff124128a9bc4a27e2f43a5951c743215d
169169
refs/heads/autosynth-securitycenter: b24087060036e623e57d2454ba5dabeaf1e530c5
170170
refs/heads/autosynth-talent: 4ca901879f86aab61091cea52e8a9b653639df24
171171
refs/tags/v0.82.0: 7b9807d5d0a400c757b8905fee768be4c85eba25

branches/autosynth-dataproc/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-dataproc/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)