jenkins-bot has submitted this change and it was merged.

Change subject: Fix NPE on unknown service
......................................................................


Fix NPE on unknown service

Bug: T112723
Change-Id: I7984e7795f2d0869d4f6a9f27d839c09eaaf5bef
---
M 
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Smalyshev: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
index 148a0b7..e4ebc30 100644
--- 
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
+++ 
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/WikibaseContextListener.java
@@ -30,6 +30,7 @@
 import com.bigdata.rdf.sparql.ast.eval.AST2BOpUtility;
 import com.bigdata.rdf.sparql.ast.eval.AbstractServiceFactoryBase;
 import com.bigdata.rdf.sparql.ast.service.IServiceOptions;
+import com.bigdata.rdf.sparql.ast.service.RemoteServiceOptions;
 import com.bigdata.rdf.sparql.ast.service.ServiceCall;
 import com.bigdata.rdf.sparql.ast.service.ServiceCallCreateParams;
 import com.bigdata.rdf.sparql.ast.service.ServiceRegistry;
@@ -139,9 +140,16 @@
      */
     private static final class DisableRemotesServiceFactory extends 
AbstractServiceFactoryBase {
 
+        /**
+         * Default service options.
+         * We use remote since that's how we get to this service in the first 
place -
+         * local ones should have been served already.
+         */
+        private static final IServiceOptions OPTIONS = new 
RemoteServiceOptions();
+
         @Override
         public IServiceOptions getServiceOptions() {
-            return null;
+            return OPTIONS;
         }
 
         @Override

-- 
To view, visit https://gerrit.wikimedia.org/r/272820
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7984e7795f2d0869d4f6a9f27d839c09eaaf5bef
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to