Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1D45C200B7E for ; Tue, 6 Sep 2016 16:58:05 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1BF5D160ACB; Tue, 6 Sep 2016 14:58:05 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 62A11160AA9 for ; Tue, 6 Sep 2016 16:58:04 +0200 (CEST) Received: (qmail 70071 invoked by uid 500); 6 Sep 2016 14:58:03 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 70062 invoked by uid 99); 6 Sep 2016 14:58:03 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Sep 2016 14:58:03 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 13197C021B for ; Tue, 6 Sep 2016 14:58:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.374 X-Spam-Level: X-Spam-Status: No, score=0.374 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id yyHzMU6211_4 for ; Tue, 6 Sep 2016 14:58:02 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 3351E5F1F3 for ; Tue, 6 Sep 2016 14:58:01 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id F0165E00B8 for ; Tue, 6 Sep 2016 14:57:59 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 45BE93A05B4 for ; Tue, 6 Sep 2016 14:57:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1759440 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/security/authorization/GlobPattern.java test/java/org/apache/jackrabbit/core/security/authorization/GlobPatternTest.java Date: Tue, 06 Sep 2016 14:57:58 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160906145759.45BE93A05B4@svn01-us-west.apache.org> archived-at: Tue, 06 Sep 2016 14:58:05 -0000 Author: mreutegg Date: Tue Sep 6 14:57:58 2016 New Revision: 1759440 URL: http://svn.apache.org/viewvc?rev=1759440&view=rev Log: JCR-3882: GlobalPattern's equals() implementation throws NullPointerException Apply Woonsan Ko's pull request. Thanks Pedro Teixeira for reporting the issue. Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/GlobPattern.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/GlobPatternTest.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/GlobPattern.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/GlobPattern.java?rev=1759440&r1=1759439&r2=1759440&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/GlobPattern.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/GlobPattern.java Tue Sep 6 14:57:58 2016 @@ -158,7 +158,7 @@ public final class GlobPattern { if (obj instanceof GlobPattern) { GlobPattern other = (GlobPattern) obj; return nodePath.equals(other.nodePath) && - (restriction == null) ? other.restriction == null : restriction.equals(other.restriction); + ((restriction == null) ? other.restriction == null : restriction.equals(other.restriction)); } return false; } Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/GlobPatternTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/GlobPatternTest.java?rev=1759440&r1=1759439&r2=1759440&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/GlobPatternTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/GlobPatternTest.java Tue Sep 6 14:57:58 2016 @@ -351,4 +351,22 @@ public class GlobPatternTest extends JUn public void testMatchesItem() { // TODO } + + public void testEquals() { + GlobPattern gp1 = GlobPattern.create("/a/b/c"); + GlobPattern gp2 = GlobPattern.create("/a/b/c"); + assertEquals(gp1, gp2); + + gp1 = GlobPattern.create("/a/b/c"); + gp2 = GlobPattern.create("/a/b/c/d"); + assertFalse(gp1.equals(gp2)); + + gp1 = GlobPattern.create("/a/b/c", null); + gp2 = GlobPattern.create("/a/b/c", ""); + assertFalse(gp1.equals(gp2)); + + gp1 = GlobPattern.create("/a/b/c", ""); + gp2 = GlobPattern.create("/a/b/c", ""); + assertEquals(gp1, gp2); + } }