svn commit: r1435543 - /manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java

[kwright]

Author: kwright
Date: Sat Jan 19 13:34:27 2013
New Revision: 1435543

URL: http://svn.apache.org/viewvc?rev=1435543&view=rev
Log:
More NPE fixes, part of CONNECTORS-617.

Modified:
    
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java

Modified: 
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java?rev=1435543&r1=1435542&r2=1435543&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
 (original)
+++ 
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
 Sat Jan 19 13:34:27 2013
@@ -1583,7 +1583,7 @@ public class DBInterfaceDerby extends Da
     try
     {
       Pattern p = Pattern.compile(regularExpression,0);
-      Matcher m = p.matcher(value);
+      Matcher m = p.matcher((value==null)?"":value);
       if (m.find())
         return "true";
       else
@@ -1603,7 +1603,7 @@ public class DBInterfaceDerby extends Da
     try
     {
       Pattern p = Pattern.compile(regularExpression,Pattern.CASE_INSENSITIVE);
-      Matcher m = p.matcher(value);
+      Matcher m = p.matcher((value==null)?"":value);
       if (m.find())
         return m.group(1);
       return "";
@@ -1626,7 +1626,7 @@ public class DBInterfaceDerby extends Da
     try
     {
       Pattern p = Pattern.compile(regularExpression,0);
-      Matcher m = p.matcher(value);
+      Matcher m = p.matcher((value==null)?"":value);
       if (m.find())
         return m.group(1);
       return "";