Author: ssmiweve
Date: 2007-06-04 17:11:00 +0200 (Mon, 04 Jun 2007)
New Revision: 5266

Modified:
   
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
Log:
avoid NPE.
 also much faster to loop through a string's charArray checking for character 
matches than using a Pattern & Matcher combination.

Modified: 
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
===================================================================
--- 
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
  2007-06-04 14:26:09 UTC (rev 5265)
+++ 
branches/2.13/core-api/src/main/java/no/schibstedsok/searchportal/mode/command/CatalogueSearchCommand.java
  2007-06-04 15:11:00 UTC (rev 5266)
@@ -462,10 +462,13 @@
     protected void visitImpl(final LeafClause clause) {
 
         final String transformedTerm = getTransformedTerms().get(clause);
-        final Pattern p = Pattern.compile("\\.|\\-");
-        final Matcher m = p.matcher(getTransformedTerms().get(clause));
 
-        final boolean hasNotWordCharacters = m.find();
+        boolean hasNotWordCharacters = false;
+        if(null != transformedTerm){
+            for(char c : transformedTerm.toCharArray()){
+                hasNotWordCharacters |= '.' == c || '-' == c;
+            }
+        }
         
         checkQueryForKeyword(clause);
         checkQueryForCompanyname(clause);

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to