Integrated fix (manually) from upper stream.

2 files changed, 5 insertions, 3 deletions

diff --git a/src/resources/pagoda.properties b/src/resources/pagoda.properties
index aa08593..8bcbca6 100644
--- a/src/resources/pagoda.properties
+++ b/src/resources/pagoda.properties
@@ -1,8 +1,8 @@
 debug=true
 useAlwaysSimpleUpperBound=false
-#skolemUpperBound=DISABLED
+skolemUpperBound=DISABLED
+#skolemUpperBound=BEFORE_SUMMARISATION
 #skolemUpperBound=BEFORE_SUMMARISATION
-skolemUpperBound=BEFORE_SUMMARISATION
 skolemDepth=10
 
 # seems ok for -Xmx6g
diff --git a/src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java b/src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java
index 02697b8..9b4ce01 100644
--- a/src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java
+++ b/src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java
@@ -184,7 +184,9 @@ public class QueryGraph {
 
         private void rollupEdge(Term u, OWLObjectPropertyExpression op, Term v, boolean inverse) {
                 if (existVars.contains(v)) {
-                        concepts.add(u, factory.getOWLObjectSomeValuesFrom(op, factory.getOWLObjectIntersectionOf(concepts.get(v))));
+                        Set<OWLClassExpression> exps = concepts.get(v);
+                        if (exps == null) exps = new HashSet<OWLClassExpression>();
+                        concepts.add(u, factory.getOWLObjectSomeValuesFrom(op, factory.getOWLObjectIntersectionOf(exps)));
                 }
                 else {
                         OWLIndividual obj = getOWLIndividual(v);