Touching UntrustedXML during bundle activator should cause it to
bind to the JRE XML provider rather than discovering other members
via a TCCL.
Change-Id: I9c6625be7873ed96d5e292a3165e7f319ac68b56
JIRA: CONTROLLER-1867
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
import org.apache.aries.quiesce.participant.QuiesceParticipant;
import org.apache.aries.util.AriesFrameworkUtil;
import org.opendaylight.controller.blueprint.ext.OpendaylightNamespaceHandler;
import org.apache.aries.quiesce.participant.QuiesceParticipant;
import org.apache.aries.util.AriesFrameworkUtil;
import org.opendaylight.controller.blueprint.ext.OpendaylightNamespaceHandler;
+import org.opendaylight.yangtools.util.xml.UntrustedXML;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
public void start(final BundleContext context) {
LOG.info("Starting {}", getClass().getSimpleName());
public void start(final BundleContext context) {
LOG.info("Starting {}", getClass().getSimpleName());
+ // CONTROLLER-1867: force UntrustedXML initialization, so that it uses our TCCL to initialize
+ UntrustedXML.newDocumentBuilder();
+
restartService = new BlueprintContainerRestartServiceImpl();
bundleContext = context;
restartService = new BlueprintContainerRestartServiceImpl();
bundleContext = context;
* @param event the event to handle
*/
@Override
* @param event the event to handle
*/
@Override
- public void blueprintEvent(BlueprintEvent event) {
+ public void blueprintEvent(final BlueprintEvent event) {
if (event.getType() == BlueprintEvent.CREATED) {
LOG.info("Blueprint container for bundle {} was successfully created", event.getBundle());
return;
if (event.getType() == BlueprintEvent.CREATED) {
LOG.info("Blueprint container for bundle {} was successfully created", event.getBundle());
return;