You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/05/27 18:00:48 UTC
svn commit: r1597813 -
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/path/eval/PathEngine.java
Author: andy
Date: Tue May 27 16:00:39 2014
New Revision: 1597813
URL: http://svn.apache.org/r1597813
Log:
Ensure no property function processing attempted if property functions are turned off.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/path/eval/PathEngine.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/path/eval/PathEngine.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/path/eval/PathEngine.java?rev=1597813&r1=1597812&r2=1597813&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/path/eval/PathEngine.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/path/eval/PathEngine.java Tue May 27 16:00:39 2014
@@ -55,19 +55,25 @@ abstract public class PathEngine
private final PropertyFunctionRegistry registry ;
protected PathEngine(Graph graph, Context context) {
- this.registry = PropertyFunctionRegistry.chooseRegistry(context) ;
- if ( registry != null ) {
- doingRDFSmember = ( registry.get(RDFSmember.getURI()) != null ) ;
- doingListMember = ( registry.get(ListMember.getURI()) != null ) ;
- } else {
- doingRDFSmember = false ;
- doingListMember = false ;
+ boolean doingRDFSmember$ = false ;
+ boolean doingListMember$ = false ;
+ PropertyFunctionRegistry registry$ = null ;
+
+ if ( context == null || context.isTrueOrUndef(ARQ.propertyFunctions) ) {
+ registry$ = PropertyFunctionRegistry.chooseRegistry(context) ;
+ if ( registry$ != null ) {
+ doingRDFSmember$ = ( registry$.get(RDFSmember.getURI()) != null ) ;
+ doingRDFSmember$ = ( registry$.get(ListMember.getURI()) != null ) ;
+ }
}
+ this.registry = registry$ ;
+ this.doingRDFSmember = doingRDFSmember$ ;
+ this.doingListMember = doingListMember$ ;
this.graph = graph ;
this.context = context ;
}
-
+
protected final Iter<Node> eval(Path path, Node node) {
return PathEval.eval$(graph, node, path, this) ;
}