You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2011/03/11 12:58:39 UTC
svn commit: r1080540 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinRow.java
Author: jukka
Date: Fri Mar 11 11:58:39 2011
New Revision: 1080540
URL: http://svn.apache.org/viewvc?rev=1080540&view=rev
Log:
JCR-2852: Support multi-selector OR constraints in join queries
Patch by Alex Parvulescu
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinRow.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinRow.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinRow.java?rev=1080540&r1=1080539&r2=1080540&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinRow.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinRow.java Fri Mar 11 11:58:39 2011
@@ -102,10 +102,14 @@ public class JoinRow extends AbstractRow
for (String selector : rightSelectors) {
builder.append(selector);
builder.append("=");
- try {
- builder.append(rightRow.getNode(selector));
- } catch (RepositoryException e) {
- builder.append(e.getMessage());
+ if(rightRow != null){
+ try {
+ builder.append(rightRow.getNode(selector));
+ } catch (RepositoryException e) {
+ builder.append(e.getMessage());
+ }
+ }else{
+ builder.append("null");
}
builder.append(" ");
}