Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5FCD61016C for ; Tue, 12 Nov 2013 18:33:22 +0000 (UTC) Received: (qmail 89095 invoked by uid 500); 12 Nov 2013 18:33:22 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 89063 invoked by uid 500); 12 Nov 2013 18:33:21 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 89054 invoked by uid 99); 12 Nov 2013 18:33:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Nov 2013 18:33:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Nov 2013 18:33:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2914023888CD; Tue, 12 Nov 2013 18:33:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1541191 - in /manifoldcf/branches/release-1.4-branch: ./ framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/ Date: Tue, 12 Nov 2013 18:32:59 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131112183300.2914023888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwright Date: Tue Nov 12 18:32:59 2013 New Revision: 1541191 URL: http://svn.apache.org/r1541191 Log: Pull up fix for CONNECTORS-796 from trunk. Modified: manifoldcf/branches/release-1.4-branch/ (props changed) manifoldcf/branches/release-1.4-branch/CHANGES.txt manifoldcf/branches/release-1.4-branch/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/TagParseState.java manifoldcf/branches/release-1.4-branch/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/XMLFuzzyHierarchicalParseState.java Propchange: manifoldcf/branches/release-1.4-branch/ ------------------------------------------------------------------------------ Merged /manifoldcf/trunk:r1537064,1537317 Modified: manifoldcf/branches/release-1.4-branch/CHANGES.txt URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.4-branch/CHANGES.txt?rev=1541191&r1=1541190&r2=1541191&view=diff ============================================================================== --- manifoldcf/branches/release-1.4-branch/CHANGES.txt (original) +++ manifoldcf/branches/release-1.4-branch/CHANGES.txt Tue Nov 12 18:32:59 2013 @@ -1,6 +1,12 @@ ManifoldCF Change Log $Id$ +======================= Release 1.4.1 ===================== + +CONNECTORS-796: Fix NPE in RSS connector having to do with +tags that aren't nested as expected. +(Benjamin Brandmeier, Karl Wright) + ======================= Release 1.4 ===================== CONNECTORS-791: Broken WHERE clause in job status query. Modified: manifoldcf/branches/release-1.4-branch/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/TagParseState.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.4-branch/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/TagParseState.java?rev=1541191&r1=1541190&r2=1541191&view=diff ============================================================================== --- manifoldcf/branches/release-1.4-branch/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/TagParseState.java (original) +++ manifoldcf/branches/release-1.4-branch/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/TagParseState.java Tue Nov 12 18:32:59 2013 @@ -238,6 +238,7 @@ public class TagParseState extends Singl currentState = TAGPARSESTATE_SAWSECONDRIGHTBRACKET; else { + currentState = TAGPARSESTATE_IN_CDATA_BODY; if (noteEscapedCharacter(']')) return true; if (noteEscapedCharacter(thisChar)) @@ -248,8 +249,15 @@ public class TagParseState extends Singl case TAGPARSESTATE_SAWSECONDRIGHTBRACKET: if (thisChar == '>') currentState = TAGPARSESTATE_NORMAL; + else if (thisChar == ']') + { + // currentstate unchanged; emit the first bracket + if (noteEscapedCharacter(']')) + return true; + } else { + currentState = TAGPARSESTATE_IN_CDATA_BODY; if (noteEscapedCharacter(']')) return true; if (noteEscapedCharacter(']')) Modified: manifoldcf/branches/release-1.4-branch/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/XMLFuzzyHierarchicalParseState.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.4-branch/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/XMLFuzzyHierarchicalParseState.java?rev=1541191&r1=1541190&r2=1541191&view=diff ============================================================================== --- manifoldcf/branches/release-1.4-branch/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/XMLFuzzyHierarchicalParseState.java (original) +++ manifoldcf/branches/release-1.4-branch/framework/core/src/main/java/org/apache/manifoldcf/core/fuzzyml/XMLFuzzyHierarchicalParseState.java Tue Nov 12 18:32:59 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.