jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r816572 - in /jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core: ./ query/xpath/QueryFormat.java
Date Fri, 18 Sep 2009 10:09:52 GMT
Author: jukka
Date: Fri Sep 18 10:09:52 2009
New Revision: 816572

URL: http://svn.apache.org/viewvc?rev=816572&view=rev
Log:
1.4: Merged revision 760876 (JCR-2052)

Modified:
    jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/   (props
changed)
    jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java

Propchange: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Sep 18 10:09:52 2009
@@ -0,0 +1,2 @@
+/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core:653417,654078,654514,655917,656240,656655,656664,658583,668086,668147,672125,678788,679389,680135,681031,681287,682409,683268,686688,691181,691550,694164,698200,698209,709142,718981,727402,733080,734366,746932
+/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons:760876

Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java?rev=816572&r1=816571&r2=816572&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java
(original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java
Fri Sep 18 10:09:52 2009
@@ -106,9 +106,6 @@
     public Object visit(QueryRootNode node, Object data) {
         StringBuffer sb = (StringBuffer) data;
         node.getLocationNode().accept(this, data);
-        if (node.getOrderNode() != null) {
-            node.getOrderNode().accept(this, data);
-        }
         Name[] selectProps = node.getSelectProperties();
         if (selectProps.length > 0) {
             sb.append('/');
@@ -131,6 +128,9 @@
                 sb.append(')');
             }
         }
+        if (node.getOrderNode() != null) {
+            node.getOrderNode().accept(this, data);
+        }
         return data;
     }
 



Mime
View raw message