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 E9DAF18378 for ; Mon, 27 Jul 2015 17:41:30 +0000 (UTC) Received: (qmail 44478 invoked by uid 500); 27 Jul 2015 17:41:27 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 44433 invoked by uid 500); 27 Jul 2015 17:41:27 -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 44424 invoked by uid 99); 27 Jul 2015 17:41:27 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jul 2015 17:41:27 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 1FEF4AC0024 for ; Mon, 27 Jul 2015 17:41:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1692917 - in /directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core: Connection.java StudioControl.java StudioPagedResultsControl.java Date: Mon, 27 Jul 2015 17:41:26 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150727174127.1FEF4AC0024@hades.apache.org> Author: elecharny Date: Mon Jul 27 17:41:25 2015 New Revision: 1692917 URL: http://svn.apache.org/r1692917 Log: o Removed useless checked on x != null when && ( x instanceof X ) Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java?rev=1692917&r1=1692916&r2=1692917&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java Mon Jul 27 17:41:25 2015 @@ -236,7 +236,7 @@ public class Connection implements Conne */ private ConnectionWrapper getJndiConnectionWrapper() { - if ( ( connectionWrapper == null ) || !( connectionWrapper instanceof JNDIConnectionWrapper ) ) + if ( !( connectionWrapper instanceof JNDIConnectionWrapper ) ) { connectionWrapper = new JNDIConnectionWrapper( this ); } @@ -253,7 +253,7 @@ public class Connection implements Conne */ private ConnectionWrapper getDirectoryApiConnectionWrapper() { - if ( ( connectionWrapper == null ) || !( connectionWrapper instanceof DirectoryApiConnectionWrapper ) ) + if ( !( connectionWrapper instanceof DirectoryApiConnectionWrapper ) ) { connectionWrapper = new DirectoryApiConnectionWrapper( this ); } Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java?rev=1692917&r1=1692916&r2=1692917&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioControl.java Mon Jul 27 17:41:25 2015 @@ -225,10 +225,11 @@ public class StudioControl implements Se */ public boolean equals( Object obj ) { - if ( obj == null || !( obj instanceof StudioControl ) ) + if ( !( obj instanceof StudioControl ) ) { return false; } + StudioControl other = ( StudioControl ) obj; return this.toString().equals( other.toString() ); Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java?rev=1692917&r1=1692916&r2=1692917&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/StudioPagedResultsControl.java Mon Jul 27 17:41:25 2015 @@ -181,10 +181,11 @@ public class StudioPagedResultsControl e */ public boolean equals( Object obj ) { - if ( obj == null || !( obj instanceof StudioPagedResultsControl ) ) + if ( !( obj instanceof StudioPagedResultsControl ) ) { return false; } + StudioPagedResultsControl other = ( StudioPagedResultsControl ) obj; return this.toString().equals( other.toString() ) && this.isScrollMode == other.isScrollMode;