directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
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 GMT
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 @@
          	   </objectState>
                <objectState
          	      name="vendorVersion"
-         	      value="1.5.8-SNAPSHOT">
+         	      value="1.5.8">
          	   </objectState>
          	</and>
          </visibility>

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 ) )



Mime
View raw message