Author: kwright
Date: Wed Oct 30 12:27:17 2013
New Revision: 1537064
URL: http://svn.apache.org/r1537064
Log:
Probable fix for CONNECTORS-796.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/XMLFuzzyHierarchicalParseState.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1537064&r1=1537063&r2=1537064&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Oct 30 12:27:17 2013
@@ -3,6 +3,10 @@ $Id$
======================= 1.5-dev =====================
+CONNECTORS-796: Fix NPE in RSS connector having to do with
+tags that aren't nested as expected.
+(Benjamin Brandmeier, Karl Wright)
+
CONNECTORS-792: Introduce concepts of authorization domain
and authority group, and appropriate UI, API, etc. changes. This
is to support federated authorization models such as what SharePoint
Modified:
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/XMLFuzzyHierarchicalParseState.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/XMLFuzzyHierarchicalParseState.java?rev=1537064&r1=1537063&r2=1537064&view=diff
==============================================================================
---
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/XMLFuzzyHierarchicalParseState.java
(original)
+++
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/XMLFuzzyHierarchicalParseState.java
Wed Oct 30 12:27:17 2013
@@ -83,7 +83,11 @@ public class XMLFuzzyHierarchicalParseSt
throws ManifoldCFException
{
// This sets currentContext == null as a side effect, unless an error
occurs during cleanup!!
- currentContext.cleanup();
+ if (currentContext != null)
+ {
+ currentContext.cleanup();
+ currentContext = null;
+ }
}
/** Map version of the noteTag method.
