MAILBOX-307 Props argument is expected to be null
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6bf7a9f1 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6bf7a9f1 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6bf7a9f1 Branch: refs/heads/master Commit: 6bf7a9f12b2b3cc5a88b747340bacf9c91f3a981 Parents: 4e10f10 Author: benwa <btell...@linagora.com> Authored: Wed Sep 27 10:20:55 2017 +0700 Committer: Matthieu Baechler <matth...@apache.org> Committed: Fri Sep 29 09:20:40 2017 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/james/mailbox/model/MailboxACL.java | 6 ++++-- .../java/org/apache/james/mailbox/model/MailboxACLTest.java | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/6bf7a9f1/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java index 09dcbbb..cfbcff0 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxACL.java @@ -633,8 +633,10 @@ public class MailboxACL { private static Map<EntryKey, Rfc4314Rights> toMap(Properties props) throws UnsupportedRightException { ImmutableMap.Builder<EntryKey, Rfc4314Rights> builder = ImmutableMap.builder(); - for (Map.Entry prop : props.entrySet()) { - builder.put(EntryKey.deserialize((String) prop.getKey()), new Rfc4314Rights((String) prop.getValue())); + if (props != null) { + for (Map.Entry prop : props.entrySet()) { + builder.put(EntryKey.deserialize((String) prop.getKey()), new Rfc4314Rights((String) prop.getValue())); + } } return builder.build(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/6bf7a9f1/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java index 5c03032..2412fbb 100644 --- a/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java +++ b/mailbox/api/src/test/java/org/apache/james/mailbox/model/MailboxACLTest.java @@ -221,4 +221,10 @@ public class MailboxACLTest { .containsAllEntriesOf(expectedEntries); } + @Test + public void propertiesConstructorShouldAcceptNullValues() throws Exception { + assertThat(new MailboxACL((Properties) null)) + .isEqualTo(MailboxACL.EMPTY); + } + } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
