Bug 561121: Adapt to enhanced AppEnvironment
Change-Id: I9872c33feaee9289a6cd006e5dc9ae1d06fed051
diff --git a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/RJContext.java b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/RJContext.java
index 7bfbac2..6e1479c 100644
--- a/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/RJContext.java
+++ b/core/org.eclipse.statet.rj.server/src/org/eclipse/statet/rj/server/util/RJContext.java
@@ -82,9 +82,11 @@
try {
final List<BundleEntry> bundles= resolveBundles(ImCollections.newList(ServerUtils.RJ_SERVER_SPEC));
for (final BundleEntry bundle : bundles) {
- final Path policyPath= bundle.getResourcePath(LOCALHOST_POLICY_FILENAME);
- if (policyPath != null && Files.isRegularFile(policyPath)) {
- return policyPath.toUri().toString();
+ if (bundle instanceof BundleEntry.Extracted) {
+ final Path policyPath= bundle.getResourcePath(LOCALHOST_POLICY_FILENAME);
+ if (policyPath != null && Files.isRegularFile(policyPath)) {
+ return policyPath.toUri().toString();
+ }
}
}
for (final BundleEntry bundle : bundles) {
diff --git a/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/LocalNodeFactory.java b/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/LocalNodeFactory.java
index cd81506..09cead0 100644
--- a/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/LocalNodeFactory.java
+++ b/servi/org.eclipse.statet.rj.servi/src/org/eclipse/statet/internal/rj/servi/LocalNodeFactory.java
@@ -196,7 +196,7 @@
p.command.add(javaHome + File.separatorChar + "bin" + File.separatorChar + "java");
{ p.command.add("-classpath");
- String s= new BundleEntry("rj-boot", rjPkgPath.resolve(Paths.get("server/rj-boot.jar")))
+ String s= new BundleEntry.Jar("rj-boot", rjPkgPath.resolve(Paths.get("server/rj-boot.jar")))
.getJClassPathString();
final String env= config.getEnvironmentVariables().get("CLASSPATH");
if (env != null) {
