Author: kwright
Date: Fri Jan 18 20:45:20 2013
New Revision: 1435335
URL: http://svn.apache.org/viewvc?rev=1435335&view=rev
Log:
Fix for CONNECTORS-617.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1435335&r1=1435334&r2=1435335&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Jan 18 20:45:20 2013
@@ -3,6 +3,9 @@ $Id$
======================= 1.2-dev =====================
+CONNECTORS-617: Simple report NPE under Derby.
+(Karl Wright)
+
======================= Release 1.1 =====================
CONNECTORS-613: Add a way of getting a document's mime type
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=1435335&r1=1435334&r2=1435335&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
Fri Jan 18 20:45:20 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
