You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by co...@apache.org on 2010/12/15 19:37:51 UTC

svn commit: r1049662 - in /incubator/opennlp/trunk/opennlp-tools/src: main/java/opennlp/tools/util/StringUtil.java test/java/opennlp/tools/util/StringUtilTest.java

Author: colen
Date: Wed Dec 15 18:37:51 2010
New Revision: 1049662

URL: http://svn.apache.org/viewvc?rev=1049662&view=rev
Log:
OPENNLP-40 removed null validation from isEmpty. It will throw a NullPointerException if a null string is passed.

Modified:
    incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/StringUtil.java
    incubator/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/util/StringUtilTest.java

Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/StringUtil.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/StringUtil.java?rev=1049662&r1=1049661&r2=1049662&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/StringUtil.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/StringUtil.java Wed Dec 15 18:37:51 2010
@@ -111,6 +111,6 @@ public class StringUtil {
     * @since 1.5.1
     */
   public static boolean isEmpty(CharSequence theString) {
-	return theString == null || theString.length() == 0;
+	return theString.length() == 0;
   }
 }

Modified: incubator/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/util/StringUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/util/StringUtilTest.java?rev=1049662&r1=1049661&r2=1049662&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/util/StringUtilTest.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/util/StringUtilTest.java Wed Dec 15 18:37:51 2010
@@ -52,9 +52,14 @@ public class StringUtilTest {
   
   @Test
   public void testIsEmpty() {
-    assertTrue(StringUtil.isEmpty(null));
     assertTrue(StringUtil.isEmpty(""));
     assertTrue(!StringUtil.isEmpty("a"));
   }
+  
+  @Test(expected=NullPointerException.class)
+  public void testIsEmptyWithNullString() {
+	// should raise a NPE  
+    StringUtil.isEmpty(null);
+  }
 
 }