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 E35DB18061 for ; Fri, 10 Jul 2015 22:09:48 +0000 (UTC) Received: (qmail 97456 invoked by uid 500); 10 Jul 2015 22:09:48 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 97406 invoked by uid 500); 10 Jul 2015 22:09:48 -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 97397 invoked by uid 99); 10 Jul 2015 22:09:48 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jul 2015 22:09:48 +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 4B864AC0032 for ; Fri, 10 Jul 2015 22:09:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1690312 - in /directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers: SizeLimitWrapper.java TimeLimitWrapper.java Date: Fri, 10 Jul 2015 22:09:47 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150710220948.4B864AC0032@hades.apache.org> Author: elecharny Date: Fri Jul 10 22:09:47 2015 New Revision: 1690312 URL: http://svn.apache.org/r1690312 Log: Fixed the tests Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SizeLimitWrapper.java directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/TimeLimitWrapper.java Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SizeLimitWrapper.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/SizeLimitWrapper.java?rev=1690312&r1=1690311&r2=1690312&view=diff ============================================================================== --- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SizeLimitWrapper.java (original) +++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SizeLimitWrapper.java Fri Jul 10 22:09:47 2015 @@ -104,7 +104,7 @@ public class SizeLimitWrapper extends Ab */ public SizeLimitWrapper( String sizeLimitStr ) { - if ( sizeLimitStr != null ) + if ( !Strings.isEmpty( sizeLimitStr ) ) { // use a lowercase version of the string String lowerCaseSizeLimitStr = sizeLimitStr.toLowerCase(); @@ -200,6 +200,14 @@ public class SizeLimitWrapper extends Ab } } } + else + { + isValid = true; + } + } + else + { + isValid = true; } } Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/TimeLimitWrapper.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/TimeLimitWrapper.java?rev=1690312&r1=1690311&r2=1690312&view=diff ============================================================================== --- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/TimeLimitWrapper.java (original) +++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/TimeLimitWrapper.java Fri Jul 10 22:09:47 2015 @@ -19,6 +19,8 @@ */ package org.apache.directory.studio.openldap.config.editor.wrappers; +import org.apache.directory.api.util.Strings; + /** * This class wraps the TimeLimit parameter : * 
@@ -69,7 +71,7 @@ public class TimeLimitWrapper extends Ab
      */
     public TimeLimitWrapper( String timeLimitStr )
     {
-        if ( timeLimitStr != null )
+        if ( !Strings.isEmpty( timeLimitStr ) )
         {
             // use a lowercase version of the string
             String lowerCaseTimeLimitStr = timeLimitStr.toLowerCase();