From oak-issues-return-82326-archive-asf-public=cust-asf.ponee.io@jackrabbit.apache.org Thu Jun 3 14:54:36 2021 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-ec2-va.apache.org (mxout1-ec2-va.apache.org [3.227.148.255]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 90B4E180643 for ; Thu, 3 Jun 2021 16:54:36 +0200 (CEST) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-ec2-va.apache.org (ASF Mail Server at mxout1-ec2-va.apache.org) with SMTP id D75D242F5D for ; Thu, 3 Jun 2021 14:54:17 +0000 (UTC) Received: (qmail 92969 invoked by uid 500); 3 Jun 2021 14:54:12 -0000 Mailing-List: contact oak-issues-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-issues@jackrabbit.apache.org Received: (qmail 92024 invoked by uid 99); 3 Jun 2021 14:54:10 -0000 Received: from mailrelay1-he-de.apache.org (HELO mailrelay1-he-de.apache.org) (116.203.21.61) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jun 2021 14:54:10 +0000 Received: from jira2-he-de.apache.org (jira2-he-de.apache.org [168.119.33.54]) by mailrelay1-he-de.apache.org (ASF Mail Server at mailrelay1-he-de.apache.org) with ESMTPS id 92F583F088 for ; Thu, 3 Jun 2021 14:54:08 +0000 (UTC) Received: from jira2-he-de.apache.org (localhost.localdomain [127.0.0.1]) by jira2-he-de.apache.org (ASF Mail Server at jira2-he-de.apache.org) with ESMTP id A0845C81ED8 for ; Thu, 3 Jun 2021 14:54:06 +0000 (UTC) Date: Thu, 3 Jun 2021 14:54:06 +0000 (UTC) From: "Miroslav Smiljanic (Jira)" To: oak-issues@jackrabbit.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Closed] (OAK-9344) JcrLastModifiedConflictHandler prone to NPE MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/OAK-9344?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Miroslav Smiljanic closed OAK-9344. ----------------------------------- > JcrLastModifiedConflictHandler prone to NPE > ------------------------------------------- > > Key: OAK-9344 > URL: https://issues.apache.org/jira/browse/OAK-9344 > Project: Jackrabbit Oak > Issue Type: Bug > Components: core > Reporter: Angela Schreiber > Assignee: Angela Schreiber > Priority: Major > Fix For: 1.40.0 > > Attachments: OAK-9344-b.patch, OAK-9344.patch > > > [~mreutegg], while working on OAK-9343 i noticed that {{JcrLastModifiedConflictHandler}} is prone to NPE as {{ISO8601.parse}} may return null. the return values however are passed to the 'pick' method which doesn't handle a potential null value... a similar problem was spotted with {{ExternalIdentityConflictHandler}} (see also OAK-8700). > {code} > private static void merge(@NotNull NodeBuilder parent, @NotNull PropertyState ours, @NotNull PropertyState theirs) { > Calendar o = parse(ours.getValue(Type.DATE)); > Calendar t = parse(theirs.getValue(Type.DATE)); > if (JCR_CREATED.equals(ours.getName())) { > parent.setProperty(ours.getName(), pick(o, t, true)); > } else { > parent.setProperty(ours.getName(), pick(o, t, false)); > } > } > private static Calendar pick(Calendar a, Calendar b, boolean jcrCreated) { > if (a.before(b)) { > return jcrCreated ? a : b; > } else { > return jcrCreated ? b : a; > } > } > {code} -- This message was sent by Atlassian Jira (v8.3.4#803005)