Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 63823 invoked from network); 24 Feb 2011 18:06:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Feb 2011 18:06:56 -0000 Received: (qmail 77538 invoked by uid 500); 24 Feb 2011 18:06:56 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 77472 invoked by uid 500); 24 Feb 2011 18:06:54 -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 77452 invoked by uid 99); 24 Feb 2011 18:06:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Feb 2011 18:06:54 +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, 24 Feb 2011 18:06:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7C03B2388A02; Thu, 24 Feb 2011 18:06:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1074242 - in /directory/studio/trunk/plugins: apacheds.configuration.v2/plugin.xml connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java Date: Thu, 24 Feb 2011 18:06:33 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110224180633.7C03B2388A02@eris.apache.org> Author: pamarcelot Date: Thu Feb 24 18:06:33 2011 New Revision: 1074242 URL: http://svn.apache.org/viewvc?rev=1074242&view=rev Log: Better handling for SNAPSHOT versions. Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml?rev=1074242&r1=1074241&r2=1074242&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/plugin.xml Thu Feb 24 18:06:33 2011 @@ -60,7 +60,7 @@ + value="1.5.8"> Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java?rev=1074242&r1=1074241&r2=1074242&view=diff ============================================================================== --- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java (original) +++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionActionFilterAdapter.java Thu Feb 24 18:06:33 2011 @@ -196,7 +196,10 @@ public class ConnectionActionFilterAdapt // VENDOR VERSION else if ( VENDOR_VERSION.equals( name ) ) { - return value.equals( "" + connection.getDetectedConnectionProperties().getVendorVersion() ); + if ( connection.getDetectedConnectionProperties().getVendorVersion() != null ) + { + return connection.getDetectedConnectionProperties().getVendorVersion().indexOf( value ) != -1; + } } // SERVER TYPE else if ( SERVER_TYPE.equals( name ) )