diff options
author | Thomas Watson | 2019-06-11 13:53:23 +0000 |
---|---|---|
committer | Thomas Watson | 2019-06-11 13:53:23 +0000 |
commit | 7b4ccf0e8557a153475beeaba4487a6319372207 (patch) | |
tree | c39ac915ed9f8422784eb62531f7ac49181c9f98 | |
parent | c5d548da544dfb951dd9b07bbc9b2fc8d3c88f41 (diff) | |
download | rt.equinox.framework-7b4ccf0e8557a153475beeaba4487a6319372207.tar.gz rt.equinox.framework-7b4ccf0e8557a153475beeaba4487a6319372207.tar.xz rt.equinox.framework-7b4ccf0e8557a153475beeaba4487a6319372207.zip |
Cleanup resolver code to match latest Apache FelixI20190618-0225I20190617-1800I20190616-1800I20190615-1800I20190614-1800I20190614-0330I20190613-1800I20190613-0210I20190612-1800I20190612-0115
Change-Id: I25b526a546bcfbaedef6368104b561fdce7ce09e
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rwxr-xr-x | bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java index 3ec67c4c5..e9a781e5e 100755 --- a/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java +++ b/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java @@ -2440,7 +2440,8 @@ public class ResolverImpl implements Resolver } @Override - public ResolutionException toException() { + public ResolutionException toException() + { return new ReasonException(ReasonException.Reason.UseConstraint, getMessage(), null, getUnresolvedRequirements()); } } @@ -2448,8 +2449,8 @@ public class ResolverImpl implements Resolver private static class EnhancedExecutor { private final Executor executor; - private final Queue<Future<Void>> awaiting = new ConcurrentLinkedQueue<>(); - private final AtomicReference<Throwable> throwable = new AtomicReference<>(); + private final Queue<Future<Void>> awaiting = new ConcurrentLinkedQueue<Future<Void>>(); + private final AtomicReference<Throwable> throwable = new AtomicReference<Throwable>(); public EnhancedExecutor(Executor executor) { @@ -2458,7 +2459,7 @@ public class ResolverImpl implements Resolver public void execute(final Runnable runnable) { - FutureTask<Void> task = new FutureTask(new Runnable() + FutureTask<Void> task = new FutureTask<Void>(new Runnable() { public void run() { @@ -2513,7 +2514,8 @@ public class ResolverImpl implements Resolver } } Throwable t = throwable.get(); - if (t!= null) { + if (t != null) + { if (t instanceof Runnable) { throw (RuntimeException) t; |