jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1232394 - in /jackrabbit/branches/2.4: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java
Date Tue, 17 Jan 2012 12:02:09 GMT
Author: jukka
Date: Tue Jan 17 12:02:08 2012
New Revision: 1232394

URL: http://svn.apache.org/viewvc?rev=1232394&view=rev
Log:
2.4: Merge trunk revisions 1221579 and 1221593.

Modified:
    jackrabbit/branches/2.4/   (props changed)
    jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
    jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java

Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 17 12:02:08 2012
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1227240
+/jackrabbit/trunk:1221447,1221579,1221593,1227240

Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java?rev=1232394&r1=1232393&r2=1232394&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
(original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java
Tue Jan 17 12:02:08 2012
@@ -938,7 +938,7 @@ public class LuceneQueryBuilder implemen
                         if (steps.length == 2) {
                             selectParent = false;
                         }
-                    } else if (step instanceof LocationStepQueryNode) {
+                    } else if (step != null) {
                         // join name test with property query if there is one
                         if (name != null) {
                             if (!name.equals(PARENT_ELEMENT_NAME)) {
@@ -982,7 +982,7 @@ public class LuceneQueryBuilder implemen
                                                indexFormatVersion,
                                                nsMappings);
                 } else {
-                    if (step instanceof LocationStepQueryNode) {
+                    if (step != null) {
                         query = new ParentAxisQuery(query, name, indexFormatVersion, nsMappings);
                     } else {
                         throw new UnsupportedOperationException();

Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java?rev=1232394&r1=1232393&r2=1232394&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java
(original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java
Tue Jan 17 12:02:08 2012
@@ -157,7 +157,6 @@ class ACLTemplate extends AbstractACLTem
         jcrRepGlob = sImpl.getJCRName(P_GLOB);
 
         // load the entries:
-        AccessControlManager acMgr = sImpl.getAccessControlManager();
         NodeIterator itr = aclNode.getNodes();
         while (itr.hasNext()) {
             NodeImpl aceNode = (NodeImpl) itr.nextNode();



Mime
View raw message