[sling-whiteboard] branch master updated: Revert to 89c8dd0f so that tests pass, but native-image build fails with NPE

[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 a4aa6a1  Revert to 89c8dd0f so that tests pass, but native-image build fails with NPE
a4aa6a1 is described below

commit a4aa6a14ee9586a41f766799f2e620c34d7e0b26
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Jul 11 16:17:56 2019 +0200

    Revert to 89c8dd0f so that tests pass, but native-image build fails with NPE
---
 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 e28d9c5..64dae78 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 = null; // NATIVE new ResourceResolverFactoryActivator();
-        // NATIVE result.registerInjectActivateService(rrfa);
+        final ResourceResolverFactoryActivator rrfa = new ResourceResolverFactoryActivator();
+        result.registerInjectActivateService(rrfa);
         result.registerInjectActivateService(new ResourceResolverFactoryService(rrfa));
 
         return result;