Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E1D9EDA89 for ; Thu, 11 Oct 2012 12:25:51 +0000 (UTC) Received: (qmail 41188 invoked by uid 500); 11 Oct 2012 12:25:51 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 41107 invoked by uid 500); 11 Oct 2012 12:25:51 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 41095 invoked by uid 99); 11 Oct 2012 12:25:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Oct 2012 12:25:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Oct 2012 12:25:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5A66A23888EA for ; Thu, 11 Oct 2012 12:25:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1397019 - in /directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor: dialogs/ widgets/ Date: Thu, 11 Oct 2012 12:25:03 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121011122503.5A66A23888EA@eris.apache.org> Author: pamarcelot Date: Thu Oct 11 12:25:02 2012 New Revision: 1397019 URL: http://svn.apache.org/viewvc?rev=1397019&view=rev Log: Fix for DIRSTUDIO-833 (NPE in ACI Item Editor when adding AttributeType permission). The 'precedence' variable is now an Integer (Object) instead of an int (primitive type). Added null checks. Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/ItemPermissionDialog.java directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/UserPermissionDialog.java directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemItemPermissionsComposite.java directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.java Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/ItemPermissionDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/ItemPermissionDialog.java?rev=1397019&r1=1397018&r2=1397019&view=diff ============================================================================== --- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/ItemPermissionDialog.java (original) +++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/ItemPermissionDialog.java Thu Oct 11 12:25:02 2012 @@ -179,7 +179,7 @@ public class ItemPermissionDialog extend // set initial values if ( initialItemPermission != null ) { - if ( initialItemPermission.getPrecedence() > -1 ) + if ( ( initialItemPermission.getPrecedence() != null ) && ( initialItemPermission.getPrecedence() > -1 ) ) { precedenceCheckbox.setSelection( true ); precedenceSpinner.setEnabled( true ); Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/UserPermissionDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/UserPermissionDialog.java?rev=1397019&r1=1397018&r2=1397019&view=diff ============================================================================== --- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/UserPermissionDialog.java (original) +++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/UserPermissionDialog.java Thu Oct 11 12:25:02 2012 @@ -175,7 +175,7 @@ public class UserPermissionDialog extend // set initial values if ( initialUserPermission != null ) { - if ( initialUserPermission.getPrecedence() > -1 ) + if ( ( initialUserPermission.getPrecedence() != null ) && ( initialUserPermission.getPrecedence() > -1 ) ) { precedenceCheckbox.setSelection( true ); precedenceSpinner.setEnabled( true ); Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemItemPermissionsComposite.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemItemPermissionsComposite.java?rev=1397019&r1=1397018&r2=1397019&view=diff ============================================================================== --- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemItemPermissionsComposite.java (original) +++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemItemPermissionsComposite.java Thu Oct 11 12:25:02 2012 @@ -125,7 +125,7 @@ public class ACIItemItemPermissionsCompo else { StringBuffer buffer = new StringBuffer(); - if ( itemPermission.getPrecedence() > -1 ) + if ( ( itemPermission.getPrecedence() != null ) && ( itemPermission.getPrecedence() > -1 ) ) { buffer.append( '(' ); buffer.append( itemPermission.getPrecedence() ); Modified: directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.java?rev=1397019&r1=1397018&r2=1397019&view=diff ============================================================================== --- directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.java (original) +++ directory/studio/trunk/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.java Thu Oct 11 12:25:02 2012 @@ -125,7 +125,7 @@ public class ACIItemUserPermissionsCompo else { StringBuffer buffer = new StringBuffer(); - if ( userPermission.getPrecedence() > -1 ) + if ( ( userPermission.getPrecedence() != null ) && ( userPermission.getPrecedence() > -1 )) { buffer.append( '(' ); buffer.append( userPermission.getPrecedence() );