Skip to content

Commit

Permalink
Issue #12668 Fix log line for jetty.home.bundle property (#12677)
Browse files Browse the repository at this point in the history
  • Loading branch information
janbartel authored Jan 9, 2025
1 parent 00fab72 commit 6b48a19
Showing 1 changed file with 1 addition and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ public class JettyBootstrapActivator implements BundleActivator
public static final String DEFAULT_JETTYHOME = "/jettyhome";

private ServiceRegistration<?> _registeredServer;
/* private PackageAdminServiceTracker _packageAdminServiceTracker;*/

/**
* Setup a new jetty Server, register it as a service.
Expand All @@ -75,10 +74,6 @@ public class JettyBootstrapActivator implements BundleActivator
@Override
public void start(final BundleContext context) throws Exception
{
// track other bundles and fragments attached to this bundle that we
// should activate, as OSGi will not call activators for them.
/* _packageAdminServiceTracker = new PackageAdminServiceTracker(context);*/

ServiceReference[] references = context.getAllServiceReferences("org.eclipse.jetty.http.HttpFieldPreEncoder", null);

if (references == null || references.length == 0)
Expand All @@ -96,14 +91,6 @@ public void start(final BundleContext context) throws Exception
@Override
public void stop(BundleContext context) throws Exception
{

/* if (_packageAdminServiceTracker != null)
{
_packageAdminServiceTracker.stop();
context.removeServiceListener(_packageAdminServiceTracker);
_packageAdminServiceTracker = null;
}
*/
try
{
if (_registeredServer != null)
Expand Down Expand Up @@ -194,7 +181,7 @@ else if (jettyHomeBundleSysProp != null)
}
if (jettyHomeBundle == null)
{
LOG.warn("Unable to find the jetty.home.bundle named {}", jettyHomeSysProp);
LOG.warn("Unable to find the jetty.home.bundle named {}", jettyHomeBundleSysProp);
return;
}
}
Expand Down

0 comments on commit 6b48a19

Please sign in to comment.