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 2015/06/26 20:07:03 UTC
[1/3] jena git commit: Unset base.
Repository: jena
Updated Branches:
refs/heads/master e9a976bae -> 37a19789a
Unset base.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/820714bf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/820714bf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/820714bf
Branch: refs/heads/master
Commit: 820714bf5b0f013aa41cb80a4bd013d6b28c8cc4
Parents: 84eca45
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 26 17:52:50 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 26 17:52:50 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/sparql/core/Prologue.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/820714bf/jena-arq/src/main/java/org/apache/jena/sparql/core/Prologue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/Prologue.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/Prologue.java
index ca4ff73..2a656d4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/Prologue.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/Prologue.java
@@ -116,6 +116,11 @@ public class Prologue
*/
public void setBaseURI(String baseURI)
{
+ if ( baseURI == null ) {
+ this.seenBaseURI = false ;
+ this.resolver = null ;
+ return ;
+ }
this.seenBaseURI = true ;
this.resolver = IRIResolver.create(baseURI) ;
}
@@ -125,6 +130,11 @@ public class Prologue
*/
public void setBaseURI(IRIResolver resolver)
{
+ if ( resolver == null ) {
+ this.seenBaseURI = false ;
+ this.resolver = null ;
+ return ;
+ }
this.seenBaseURI = true ;
this.resolver = resolver ;
}
[3/3] jena git commit: Merge remote-tracking branch
'refs/remotes/origin/master'
Posted by an...@apache.org.
Merge remote-tracking branch 'refs/remotes/origin/master'
the commit.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/37a19789
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/37a19789
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/37a19789
Branch: refs/heads/master
Commit: 37a19789a5e6033621d834ffb64ee8e17124e4ca
Parents: 4fb9bca e9a976b
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 26 19:06:54 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 26 19:06:54 2015 +0100
----------------------------------------------------------------------
.../jena/rdfxml/xmloutput/impl/Unparser.java | 9 +++----
.../jena/util/iterator/LateBindingIterator.java | 3 +++
.../apache/jena/util/iterator/LazyIterator.java | 26 +++++++++++++++++++-
3 files changed, 32 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/3] jena git commit: Copy aggregators in a shallow copy.
Posted by an...@apache.org.
Copy aggregators in a shallow copy.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4fb9bca9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4fb9bca9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4fb9bca9
Branch: refs/heads/master
Commit: 4fb9bca9d813a98ea0604a7ff6fbadbd9c327be2
Parents: 820714b
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 26 18:41:47 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 26 18:41:47 2015 +0100
----------------------------------------------------------------------
.../syntax/syntaxtransform/QueryTransformOps.java | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4fb9bca9/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/QueryTransformOps.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/QueryTransformOps.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/QueryTransformOps.java
index b118cf9..c05823a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/QueryTransformOps.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/QueryTransformOps.java
@@ -122,15 +122,9 @@ public class QueryTransformOps {
for (String x : desc.getDefaultGraphURIs())
newQuery.addNamedGraphURI(x) ;
}
- // Not needed in a shallow copy?
- // for ( ExprAggregator agg : query.getAggregators() )
- // {
- // // Hooks for
- // //aggregatorsAllocated.put(key, v) ;
- // //aggregatorsMap.put(v, aggExpr) ;
- // //aggregators.add(aggExpr) ;
- // }
-
+
+ // Aggregators.
+ newQuery.getAggregators().addAll(query.getAggregators()) ;
}
@Override