You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/07/11 09:09:26 UTC

svn commit: r1690354 - /directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AbstractLimitWrapper.java

Author: elecharny
Date: Sat Jul 11 07:09:25 2015
New Revision: 1690354

URL: http://svn.apache.org/r1690354
Log:
Fixed the toString method

Modified:
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AbstractLimitWrapper.java

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AbstractLimitWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AbstractLimitWrapper.java?rev=1690354&r1=1690353&r2=1690354&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AbstractLimitWrapper.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AbstractLimitWrapper.java Sat Jul 11 07:09:25 2015
@@ -167,15 +167,19 @@ public abstract class AbstractLimitWrapp
         if ( globalLimit != null )
         {
             // The globalLimit overrides the soft and hard limit
-            sb.append( limitType ).append( "=" );
+            sb.append( limitType );
             
-            if ( globalLimit.equals( UNLIMITED ) )
+            if ( globalLimit.intValue() >= 0 )
             {
-                sb.append( UNLIMITED_STR );
+                sb.append( "=" ).append( globalLimit );
             }
-            else if ( globalLimit.intValue() >= 0 )
+            else if ( globalLimit.equals( UNLIMITED ) )
             {
-                sb.append( globalLimit );
+                sb.append( "=" ).append( UNLIMITED_STR );
+            }
+            else if ( globalLimit.equals( HARD_SOFT ) )
+            {
+                sb.append( ".hard=" ).append( SOFT_STR ); 
             }
         }
         else