You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by th...@apache.org on 2017/07/21 06:40:41 UTC

svn commit: r1802548 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java

Author: thomasm
Date: Fri Jul 21 06:40:40 2017
New Revision: 1802548

URL: http://svn.apache.org/viewvc?rev=1802548&view=rev
Log:
OAK-6359 Change behavior for very complex queries

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java?rev=1802548&r1=1802547&r2=1802548&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java Fri Jul 21 06:40:40 2017
@@ -316,12 +316,7 @@ public class Statement {
             if (measure) {
                 buff.append("measure ");
             }
-            try {
-                buff.append(s1).append(" union ").append(s2);
-            } catch (OutOfMemoryError | StackOverflowError e) {
-System.out.println("OOME");                
-                throw e;
-            }
+            buff.append(s1).append(" union ").append(s2);
             // order by ...
             if (orderList != null && !orderList.isEmpty()) {
                 buff.append(" order by ");