commit 8d2516a4fe7e60eacbe8b4fafa4f303b87e66cfb
author Ed Merks <ed.merks@gmail.com> Wed Apr 13 14:00:18 2022 +0200
committer Ed Merks <ed.merks@gmail.com> Wed Apr 13 14:00:18 2022 +0200
tree 78cec94909e6a54b69718af06bbce2bdc9c77363
parent 89fdaa816e71dbf1ffc3288832b9ca82a7c9f043

[Releng] Fix broken profile registry parser.

plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/LazyProfileRegistry.java

diff --git a/plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/LazyProfileRegistry.java b/plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/LazyProfileRegistry.java
index fa67cbf..0c759ce 100644
--- a/plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/LazyProfileRegistry.java
+++ b/plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/LazyProfileRegistry.java
@@ -57,7 +57,9 @@
 
   private final Class<?> parserClass;
 
-  private final Constructor<?> parserConstructor;
+  private Constructor<?> parserConstructor;
+
+  private Constructor<?> parserConstructor2;
 
   private final Method parseMethod;
 
@@ -101,7 +103,15 @@
     try
     {
       parserClass = CommonPlugin.loadClass(EngineActivator.ID, "org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry$Parser"); //$NON-NLS-1$
-      parserConstructor = ReflectUtil.getConstructor(parserClass, SimpleProfileRegistry.class, BundleContext.class, String.class);
+      try
+      {
+        parserConstructor = ReflectUtil.getConstructor(parserClass, SimpleProfileRegistry.class, BundleContext.class, String.class);
+      }
+      catch (Throwable ex)
+      {
+        parserConstructor2 = ReflectUtil.getConstructor(parserClass, SimpleProfileRegistry.class, String.class);
+      }
+
       parseMethod = ReflectUtil.getMethod(parserClass, "parse", File.class); //$NON-NLS-1$
       addProfilePlaceHolderMethod = ReflectUtil.getMethod(parserClass, "addProfilePlaceHolder", String.class); //$NON-NLS-1$
       getProfileMapMethod = ReflectUtil.getMethod(parserClass, "getProfileMap"); //$NON-NLS-1$
@@ -304,7 +314,8 @@
 
     try
     {
-      Object parser = ReflectUtil.newInstance(parserConstructor, this, EngineActivator.getContext(), EngineActivator.ID);
+      Object parser = parserConstructor == null ? ReflectUtil.newInstance(parserConstructor2, this, EngineActivator.ID)
+          : ReflectUtil.newInstance(parserConstructor, this, EngineActivator.getContext(), EngineActivator.ID);
 
       ProfileLock lock = profileLocks.get(profileId);
       if (lock == null && canWrite)