summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntje Fuhrmann2013-01-31 02:42:31 (EST)
committerSven Rottstock2013-01-31 02:42:31 (EST)
commit03668d80c486b13aa4c43fc6338c7e96c0037099 (patch)
treeffa7b7dff31ebcd5c0c98db8203df3a1698772a8
parent3520aca07de53be23cacad800d43eebdb8d496eb (diff)
downloadorg.eclipse.stardust.engine-03668d80c486b13aa4c43fc6338c7e96c0037099.zip
org.eclipse.stardust.engine-03668d80c486b13aa4c43fc6338c7e96c0037099.tar.gz
org.eclipse.stardust.engine-03668d80c486b13aa4c43fc6338c7e96c0037099.tar.bz2
Jira-ID: CRNT-27825
ActivityInstanceQuery with ExcludeUserPolicy.EXCLUDE_USER applied still does perform extra SQL fetches for ProcessInstances if StructuredDataValue with XPath to primitive leaf node is used git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/engine@62639 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/runtime/utils/AbstractAuthorization2Predicate.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/runtime/utils/AbstractAuthorization2Predicate.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/runtime/utils/AbstractAuthorization2Predicate.java
index 77c58f8..f6acd95 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/runtime/utils/AbstractAuthorization2Predicate.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/runtime/utils/AbstractAuthorization2Predicate.java
@@ -80,6 +80,7 @@ import org.eclipse.stardust.engine.core.runtime.beans.removethis.SecurityPropert
import org.eclipse.stardust.engine.core.spi.extensions.runtime.AccessPathEvaluationContext;
import org.eclipse.stardust.engine.core.spi.extensions.runtime.ExtendedAccessPathEvaluator;
import org.eclipse.stardust.engine.core.spi.extensions.runtime.SpiUtils;
+import org.eclipse.stardust.engine.core.struct.StructuredTypeRtUtils;
import org.eclipse.stardust.engine.extensions.dms.data.DmsConstants;
/**
@@ -642,7 +643,9 @@ public abstract class AbstractAuthorization2Predicate implements Authorization2P
}
}
}
- if (!StringUtils.isEmpty(dataPath))
+
+ if (!StructuredTypeRtUtils.isStructuredType(data.getType().getId())
+ && !StringUtils.isEmpty(dataPath))
{
IProcessInstance processInstance = ProcessInstanceBean
.findByOID(processInstanceOID);