Permalink
Browse files

patch for an eXist error that prevents jobs canceling from working co…

…rrectly
  • Loading branch information...
1 parent 8e620ba commit 39aea0a63ffd8f4f51e2cbad55186051ae17f27f @EfraimFeinstein EfraimFeinstein committed Nov 28, 2011
Showing with 15 additions and 1 deletion.
  1. +2 −1 Makefile
  2. +13 −0 setup/exist-r14773.patch
View
@@ -122,7 +122,7 @@ XSPECREPO = http://xspec.googlecode.com/svn/trunk/
XSLTFORMSDIR = $(LIBDIR)/xsltforms
XSLTFORMSREPO = https://xsltforms.svn.sourceforge.net/svnroot/xsltforms
-XSLTFORMS_REVISION ?= -r 519
+XSLTFORMS_REVISION ?= -r 520
XSLTDOCDIR = $(LIBDIR)/XSLTDoc
XSLTDOCREPO = https://xsltdoc.svn.sourceforge.net/svnroot/xsltdoc/trunk/xsltdoc
@@ -187,6 +187,7 @@ IZPACK:=$(shell $(LIBDIR)/absolutize $(LIBDIR)/IzPack)
# build eXist (what dependencies should this have?)
$(EXIST_INSTALL_JAR): svn-exist
cp setup/exist-extensions-local.build.properties $(LIBDIR)/exist/extensions/local.build.properties
+ -patch -p0 < $(SETUPDIR) exist-r14773.patch
rm -f $(LIBDIR)/exist/extensions/indexes/lucene/lib/*2.9.2.jar
cp $(LIBDIR)/hebmorph/java/lucene.hebrew/lib/lucene*2.9.3.jar $(LIBDIR)/exist/extensions/indexes/lucene/lib
cd $(LIBDIR)/exist && \
View
@@ -0,0 +1,13 @@
+Index: src/org/exist/xquery/Predicate.java
+===================================================================
+--- lib/exist/src/org/exist/xquery/Predicate.java (revision 14772)
++++ lib/exist/src/org/exist/xquery/Predicate.java (revision 14773)
+@@ -287,6 +287,8 @@
+ if (inner == null)
+ result = Sequence.EMPTY_SEQUENCE;
+ else {
++ if (executionMode == UNKNOWN)
++ executionMode = BOOLEAN;
+ int recomputedExecutionMode = executionMode;
+
+ Sequence innerSeq = null;

0 comments on commit 39aea0a

Please sign in to comment.