Attachment 879069 Details for Bug 1080171 – Possible patch

[patch] Possible patch

BZ_1080171.patch (text/plain), 2.13 KB, created by Heiko W. Rupp on 2014-03-26 15:44:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Heiko W. Rupp

Created: 2014-03-26 15:44:07 UTC

Size: 2.13 KB

patch

obsolete

>Index: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
>IDEA additional info:
>Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
><+>ISO-8859-1
>===================================================================
>--- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java	(date 1395679610000)
>+++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java	(revision )
>@@ -70,7 +70,7 @@
>         RESOURCE, // specifies the resource alias to join on for standard res-group-role-subject authorization checking
>         GROUP, // specifies the group alias to join on for standard group-role-subject authorization checking
>         BUNDLE, // specifies the bundle alias to join on for standard bundle-bundleGroup-role-subject authorization checking
>-        BUNDLE_GROUP; // specifies the bundle group alias to join on for standard bundleGroup-role-subject authorization checking        
>+        BUNDLE_GROUP; // specifies the bundle group alias to join on for standard bundleGroup-role-subject authorization checking
>     }
> 
>     private Criteria criteria;
>@@ -536,10 +536,6 @@
>         }
> 
>         Map<String, Object> filterFields = getFilterFields(criteria);
>-        if (filterFields.size() > 0 || authorizationPermsFragment != null
>-            || authorizationCustomConditionFragment != null || searchExpressionWhereClause != null) {
>-            results.append("WHERE ");
>-        }
> 
>         String conjunctiveFragment = criteria.isFiltersOptional() ? "OR " : "AND ";
>         boolean wantCaseInsensitiveMatch = !criteria.isCaseSensitive();
>@@ -585,7 +581,9 @@
>             conjunctiveResults.append(fragment).append(' ');
>         }
> 
>-        if (conjunctiveResults.length() > 0) {
>+        if ((filterFields.size() > 0 && conjunctiveResults.length()>0) || authorizationPermsFragment != null
>+            || authorizationCustomConditionFragment != null || searchExpressionWhereClause != null ) {
>+            results.append("WHERE ");
>             results.append("( ").append(conjunctiveResults).append(")");
>         }
>

Actions: View | Diff

Attachments on bug 1080171: 879069