[DL-Learner SVN] SF.net SVN: dl-learner:[4080] trunk/components-core/src/main/java/org/ dllearner

[<and...@us...>]

Revision: 4080
          http://sourceforge.net/p/dl-learner/code/4080
Author:   andremelo
Date:     2013-09-05 07:22:38 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
Fixing PrefixTrie IndexOutOfBounds and NullPointerEnception

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/SimpleEntityCandidatesTrie.java
    trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/PrefixTrie.java

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/SimpleEntityCandidatesTrie.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/SimpleEntityCandidatesTrie.java	2013-09-04 16:44:09 UTC (rev 4079)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/SimpleEntityCandidatesTrie.java	2013-09-05 07:22:38 UTC (rev 4080)
@@ -55,7 +55,8 @@
 
 	@Override
 	public String getLongestMatch(String s) {
-		return trie.getLongestMatch(s).toString();
+		CharSequence match = trie.getLongestMatch(s);
+		return (match!=null) ? trie.getLongestMatch(s).toString() : null;
 	}
 
 }

Modified: trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/PrefixTrie.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/PrefixTrie.java	2013-09-04 16:44:09 UTC (rev 4079)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/PrefixTrie.java	2013-09-05 07:22:38 UTC (rev 4080)
@@ -116,7 +116,10 @@
         break;
       }
     }
-    return s.subSequence(0, i-1);
+    if (i<=0)
+    	return null;
+    else
+    	return s.subSequence(0, i-1);
   }
 
   /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.