svn commit: r1437955 - in /manifoldcf/branches/release-1.1-branch: CHANGES.txt framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java

[kwright]

Author: kwright
Date: Thu Jan 24 11:08:53 2013
New Revision: 1437955

URL: http://svn.apache.org/viewvc?rev=1437955&view=rev
Log:
Fix for CONNECTORS-617.

Modified:
    manifoldcf/branches/release-1.1-branch/CHANGES.txt
    
manifoldcf/branches/release-1.1-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java

Modified: manifoldcf/branches/release-1.1-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/CHANGES.txt?rev=1437955&r1=1437954&r2=1437955&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.1-branch/CHANGES.txt Thu Jan 24 11:08:53 2013
@@ -3,6 +3,9 @@ $Id$
 
 ======================= Release 1.1 =====================
 
+CONNECTORS-617: Simple report NPE under Derby.
+(Karl Wright)
+
 CONNECTORS-621: Solr connector commit logic needs to use specified
 update path.
 (Karl Wright)

Modified: 
manifoldcf/branches/release-1.1-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java?rev=1437955&r1=1437954&r2=1437955&view=diff
==============================================================================
--- 
manifoldcf/branches/release-1.1-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
 (original)
+++ 
manifoldcf/branches/release-1.1-branch/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
 Thu Jan 24 11:08:53 2013
@@ -1563,7 +1563,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 "true";
       else
@@ -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 "";