Skip to content

Commit e007686

Browse files
dizzzzdizzzz
authored
Merge pull request #4766 from evolvedbinary/hotfix/scanMatches-npe
Hotfix for NPE in LuceneMatchListener.scanMatches when expanding node containing both Lucene & NGram matches
2 parents 1d938c3 + ce56954 commit e007686

File tree

7 files changed

+1412
-2
lines changed

7 files changed

+1412
-2
lines changed

‎extensions/indexes/indexes-integration-tests/pom.xml‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
eXist-db Open Source Native XML Database
5+
Copyright (C) 2001 The eXist-db Authors
6+
7+
[email protected]
8+
http://www.exist-db.org
9+
10+
This library is free software; you can redistribute it and/or
11+
modify it under the terms of the GNU Lesser General Public
12+
License as published by the Free Software Foundation; either
13+
version 2.1 of the License, or (at your option) any later version.
14+
15+
This library is distributed in the hope that it will be useful,
16+
but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18+
Lesser General Public License for more details.
19+
20+
You should have received a copy of the GNU Lesser General Public
21+
License along with this library; if not, write to the Free Software
22+
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23+
24+
-->
25+
26+
<project xmlns="http://maven.apache.org/POM/4.0.0"
27+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
28+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
29+
<parent>
30+
<artifactId>exist</artifactId>
31+
<groupId>org.exist-db</groupId>
32+
<version>7.0.0-SNAPSHOT</version>
33+
<relativePath>../../../pom.xml</relativePath>
34+
</parent>
35+
<modelVersion>4.0.0</modelVersion>
36+
37+
<artifactId>indexes-integration-tests</artifactId>
38+
39+
<packaging>jar</packaging>
40+
41+
<name>eXist-db Index Integration Tests</name>
42+
<description>eXist-db NoSQL Database Index Integration Tests</description>
43+
44+
<scm>
45+
<connection>scm:git:https://github.com/exist-db/exist.git</connection>
46+
<developerConnection>scm:git:https://github.com/exist-db/exist.git</developerConnection>
47+
<url>scm:git:https://github.com/exist-db/exist.git</url>
48+
<tag>HEAD</tag>
49+
</scm>
50+
51+
<dependencies>
52+
53+
<dependency>
54+
<groupId>org.exist-db</groupId>
55+
<artifactId>exist-core</artifactId>
56+
<version>${project.version}</version>
57+
<scope>test</scope>
58+
</dependency>
59+
60+
<dependency>
61+
<groupId>org.exist-db</groupId>
62+
<artifactId>exist-index-lucene</artifactId>
63+
<version>${project.version}</version>
64+
<scope>runtime</scope>
65+
</dependency>
66+
67+
<dependency>
68+
<groupId>org.exist-db</groupId>
69+
<artifactId>exist-index-ngram</artifactId>
70+
<version>${project.version}</version>
71+
<scope>runtime</scope>
72+
</dependency>
73+
74+
<dependency>
75+
<groupId>junit</groupId>
76+
<artifactId>junit</artifactId>
77+
<scope>test</scope>
78+
</dependency>
79+
80+
</dependencies>
81+
82+
<build>
83+
84+
<testResources>
85+
<testResource>
86+
<directory>src/test/resources</directory>
87+
<filtering>false</filtering>
88+
</testResource>
89+
<testResource>
90+
<directory>src/test/resources-filtered</directory>
91+
<filtering>true</filtering>
92+
</testResource>
93+
</testResources>
94+
95+
<plugins>
96+
<plugin>
97+
<groupId>org.apache.maven.plugins</groupId>
98+
<artifactId>maven-dependency-plugin</artifactId>
99+
<executions>
100+
<execution>
101+
<id>analyze</id>
102+
<goals>
103+
<goal>analyze-only</goal>
104+
</goals>
105+
<configuration>
106+
<failOnWarning>false</failOnWarning>
107+
<ignoredUnusedDeclaredDependencies>
108+
<ignoredUnusedDeclaredDependency>exist-index-lucene:jar:${project.version}</ignoredUnusedDeclaredDependency>
109+
<ignoredUnusedDeclaredDependency>exist-index-ngram:${project.version}</ignoredUnusedDeclaredDependency>
110+
</ignoredUnusedDeclaredDependencies>
111+
</configuration>
112+
</execution>
113+
</executions>
114+
</plugin>
115+
</plugins>
116+
117+
</build>
118+
119+
</project>

‎extensions/indexes/indexes-integration-tests/src/test/java/xquery/indexing/tests/IndexingTests.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* eXist-db Open Source Native XML Database
3+
* Copyright (C) 2001 The eXist-db Authors
4+
*
5+
* [email protected]
6+
* http://www.exist-db.org
7+
*
8+
* This library is free software; you can redistribute it and/or
9+
* modify it under the terms of the GNU Lesser General Public
10+
* License as published by the Free Software Foundation; either
11+
* version 2.1 of the License, or (at your option) any later version.
12+
*
13+
* This library is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
* Lesser General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU Lesser General Public
19+
* License along with this library; if not, write to the Free Software
20+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21+
*/
22+
package xquery.indexing.tests;
23+
24+
import org.exist.test.runner.XSuite;
25+
import org.junit.runner.RunWith;
26+
27+
@RunWith(XSuite.class)
28+
@XSuite.XSuiteFiles({
29+
"src/test/xquery/indexing/tests"
30+
})
31+
public class IndexingTests {
32+
}

0 commit comments

Comments
 (0)