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/17 13:45:28 UTC
svn commit: r1691524 - in
/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers:
SizeLimitWrapper.java TimeLimitWrapper.java
Author: elecharny
Date: Fri Jul 17 11:45:27 2015
New Revision: 1691524
URL: http://svn.apache.org/r1691524
Log:
Fixed a NumberFormatException
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=1691524&r1=1691523&r2=1691524&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 17 11:45:27 2015
@@ -273,13 +273,20 @@ public class SizeLimitWrapper extends Ab
{
pos += integer.length();
- Integer value = Integer.valueOf( integer );
-
- if ( value > UNLIMITED )
- {
- slw.globalLimit = value;
+ try
+ {
+ Integer value = Integer.valueOf( integer );
+
+ if ( value > UNLIMITED )
+ {
+ slw.globalLimit = value;
+ }
+ else
+ {
+ return false;
+ }
}
- else
+ catch ( NumberFormatException nfe )
{
return false;
}
@@ -319,11 +326,20 @@ public class SizeLimitWrapper extends Ab
if ( integer != null )
{
pos += integer.length();
- Integer value = Integer.valueOf( integer );
- if ( value >= UNLIMITED )
+ try
+
{
- slw.hardLimit = value;
+ Integer value = Integer.valueOf( integer );
+
+ if ( value >= UNLIMITED )
+ {
+ slw.hardLimit = value;
+ }
+ }
+ catch ( NumberFormatException nfe )
+ {
+ return false;
}
}
else
@@ -355,14 +371,21 @@ public class SizeLimitWrapper extends Ab
if ( integer != null )
{
- pos += integer.length();
- Integer value = Integer.valueOf( integer );
-
- if ( value > UNLIMITED )
+ try
{
- slw.softLimit = value;
+ pos += integer.length();
+ Integer value = Integer.valueOf( integer );
+
+ if ( value > UNLIMITED )
+ {
+ slw.softLimit = value;
+ }
+ else
+ {
+ return false;
+ }
}
- else
+ catch ( NumberFormatException nfe )
{
return false;
}
@@ -402,14 +425,21 @@ public class SizeLimitWrapper extends Ab
if ( integer != null )
{
- pos += integer.length();
- Integer value = Integer.valueOf( integer );
-
- if ( value > UNLIMITED )
+ try
{
- slw.uncheckedLimit = value;
+ pos += integer.length();
+ Integer value = Integer.valueOf( integer );
+
+ if ( value > UNLIMITED )
+ {
+ slw.uncheckedLimit = value;
+ }
+ else
+ {
+ return false;
+ }
}
- else
+ catch ( NumberFormatException nfe )
{
return false;
}
@@ -455,14 +485,21 @@ public class SizeLimitWrapper extends Ab
if ( integer != null )
{
- pos += integer.length();
- Integer value = Integer.valueOf( integer );
-
- if ( value > UNLIMITED )
+ try
{
- slw.prLimit = value;
+ pos += integer.length();
+ Integer value = Integer.valueOf( integer );
+
+ if ( value > UNLIMITED )
+ {
+ slw.prLimit = value;
+ }
+ else
+ {
+ return false;
+ }
}
- else
+ catch ( NumberFormatException nfe )
{
return false;
}
@@ -508,14 +545,21 @@ public class SizeLimitWrapper extends Ab
if ( integer != null )
{
- pos += integer.length();
- Integer value = Integer.valueOf( integer );
-
- if ( value > UNLIMITED )
+ try
{
- slw.prTotalLimit = value;
+ pos += integer.length();
+ Integer value = Integer.valueOf( integer );
+
+ if ( value > UNLIMITED )
+ {
+ slw.prTotalLimit = value;
+ }
+ else
+ {
+ return false;
+ }
}
- else
+ catch ( NumberFormatException nfe )
{
return false;
}
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=1691524&r1=1691523&r2=1691524&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 17 11:45:27 2015
@@ -191,14 +191,21 @@ public class TimeLimitWrapper extends Ab
if ( integer != null )
{
pos += integer.length();
-
- Integer value = Integer.valueOf( integer );
-
- if ( value > UNLIMITED )
+
+ try
{
- tlw.globalLimit = value;
+ Integer value = Integer.valueOf( integer );
+
+ if ( value > UNLIMITED )
+ {
+ tlw.globalLimit = value;
+ }
+ else
+ {
+ return false;
+ }
}
- else
+ catch ( NumberFormatException nfe )
{
return false;
}
@@ -238,11 +245,19 @@ public class TimeLimitWrapper extends Ab
if ( integer != null )
{
pos += integer.length();
- Integer value = Integer.valueOf( integer );
- if ( value >= UNLIMITED )
+ try
{
- tlw.hardLimit = value;
+ Integer value = Integer.valueOf( integer );
+
+ if ( value >= UNLIMITED )
+ {
+ tlw.hardLimit = value;
+ }
+ }
+ catch ( NumberFormatException nfe )
+ {
+ return false;
}
}
else
@@ -275,13 +290,21 @@ public class TimeLimitWrapper extends Ab
if ( integer != null )
{
pos += integer.length();
- Integer value = Integer.valueOf( integer );
-
- if ( value > UNLIMITED )
+
+ try
{
- tlw.softLimit = value;
+ Integer value = Integer.valueOf( integer );
+
+ if ( value > UNLIMITED )
+ {
+ tlw.softLimit = value;
+ }
+ else
+ {
+ return false;
+ }
}
- else
+ catch ( NumberFormatException nfe )
{
return false;
}