Skip to content

Fix validateTags() bug #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karllessard merged 1 commit into from
Oct 15, 2020
Merged

Fix validateTags() bug #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/SavedModelBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ opts, runOpts, new BytePointer(exportDir), new PointerPointer(tags),
}

private static void validateTags(String[] tags) {
if (tags == null || tags.length == 0 || Arrays.stream(tags).anyMatch(t -> t == null || t.isEmpty())) {
if (tags == null || Arrays.stream(tags).anyMatch(t -> t == null || t.isEmpty())) {
throw new IllegalArgumentException("Invalid tags: " + Arrays.toString(tags));
}
}
Expand Down
10 changes: 2 additions & 8 deletions tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/SavedModelBundleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,7 @@ public void cannotExportMultipleFunctionsWithSameSignatureKey() throws IOExcepti
@Test
public void cannotExportOrImportInvalidTags() {
assertThrows(IllegalArgumentException.class, () ->
SavedModelBundle.loader("/").withTags()
);
assertThrows(IllegalArgumentException.class, () ->
SavedModelBundle.loader("/").withTags(new String[]{})
SavedModelBundle.loader("/").withTags(null)
);
assertThrows(IllegalArgumentException.class, () ->
SavedModelBundle.loader("/").withTags(new String[]{"tag", null})
Expand All @@ -274,10 +271,7 @@ public void cannotExportOrImportInvalidTags() {
SavedModelBundle.loader("/").withTags(new String[]{"tag", ""})
);
assertThrows(IllegalArgumentException.class, () ->
SavedModelBundle.exporter("/").withTags()
);
assertThrows(IllegalArgumentException.class, () ->
SavedModelBundle.exporter("/").withTags(new String[]{})
SavedModelBundle.exporter("/").withTags(null)
);
assertThrows(IllegalArgumentException.class, () ->
SavedModelBundle.exporter("/").withTags(new String[]{"tag", null})
Expand Down