From: Tony Tkacik Date: Thu, 3 Jul 2014 10:49:05 +0000 (+0000) Subject: Merge "BUG-868: Fix a warning in EmptyNodeWrapper" X-Git-Tag: release/helium~558 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=6f80291fa17b2bbe091fd0f8ae88b8c4ae34a411;hp=04067d34aeb80d3b11264210773c1fc98a47665d Merge "BUG-868: Fix a warning in EmptyNodeWrapper" --- diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java index c9402c62ab..60a7e81c4c 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java @@ -9,6 +9,7 @@ package org.opendaylight.controller.sal.dom.broker; import static com.google.common.base.Preconditions.checkState; +import com.google.common.annotations.VisibleForTesting; import java.net.URL; import java.util.ArrayList; import java.util.Collections; @@ -68,6 +69,11 @@ public class GlobalBundleScanningSchemaServiceImpl implements SchemaContextProvi return instance; } + @VisibleForTesting + public static synchronized void destroyInstance() { + instance = null; + } + public BundleContext getContext() { return context; }