[sling-whiteboard] branch master updated: Native build works with these changes, throws NPE without them (with GraalVM CE 19.1.0)

[bd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 62b089b  Native build works with these changes, throws NPE without them (with GraalVM CE 19.1.0)
62b089b is described below

commit 62b089bb5400fdfb38c29a4e5073950e3b11db6e
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Jul 11 15:35:09 2019 +0200

    Native build works with these changes, throws NPE without them (with GraalVM CE 19.1.0)
---
 graalvm/src/main/java/org/apache/sling/graalvm/osgi/SlingContext.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/graalvm/src/main/java/org/apache/sling/graalvm/osgi/SlingContext.java b/graalvm/src/main/java/org/apache/sling/graalvm/osgi/SlingContext.java
index 64dae78..e28d9c5 100644
--- a/graalvm/src/main/java/org/apache/sling/graalvm/osgi/SlingContext.java
+++ b/graalvm/src/main/java/org/apache/sling/graalvm/osgi/SlingContext.java
@@ -45,8 +45,8 @@ public class SlingContext {
         //result.registerInjectActivateService(new MockResourceResolver(mrp));
         result.registerInjectActivateService(new MockServiceUserMapper());
         result.registerInjectActivateService(new ResourceAccessSecurityTracker());
-        final ResourceResolverFactoryActivator rrfa = new ResourceResolverFactoryActivator();
-        result.registerInjectActivateService(rrfa);
+        final ResourceResolverFactoryActivator rrfa = null; // NATIVE new ResourceResolverFactoryActivator();
+        // NATIVE result.registerInjectActivateService(rrfa);
         result.registerInjectActivateService(new ResourceResolverFactoryService(rrfa));
 
         return result;