Skip to content

LDEV-6145 - do not rename bundle JAR if Felix already has it registered #2766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zspitzer wants to merge 1 commit into
base: 6.2
Choose a base branch
from
+16 −0
Open

LDEV-6145 - do not rename bundle JAR if Felix already has it registered #2766

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions core/src/main/java/lucee/runtime/osgi/OSGiUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,22 @@ private static BundleFile improveFileName(File bundlDirectory, BundleFile bf) {

String preferedName = bf.getSymbolicName() + "-" + bf.getVersionAsString() + ".jar";
if (!preferedName.equals(f.getName())) {
// LDEV-6145: do not rename if Felix already has this bundle registered at the current path.
// Renaming without updating Felix leaves the cache pointing at the old (now missing) path,
// causing "Bundle symbolic name and version are not unique" on the next restart.
try {
BundleContext bc = CFMLEngineFactory.getInstance().getBundleContext();
if (bc != null) {
String location = f.getAbsolutePath();
for (Bundle b: bc.getBundles()) {
if (location.equals(b.getLocation())) return bf;
}
}
}
catch (Exception e) {
// engine not yet started; safe to rename
}

try {
File nf = new File(f.getParentFile(), preferedName);
if (f.renameTo(nf)) {
Expand Down
Loading