Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "One more fix to pass release-prepareonly"
[controller.git]
/
opendaylight
/
md-sal
/
sal-binding-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
binding
/
impl
/
NotificationBrokerImpl.xtend
diff --git
a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend
b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend
index e8b3850b77b665113b3bac0d9e33c8029cc592fc..52aa8d029066b3093a90300f6bb078886b2b3d7b 100644
(file)
--- a/
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend
+++ b/
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend
@@
-21,7
+21,8
@@
import org.opendaylight.yangtools.concepts.ListenerRegistration
import org.opendaylight.yangtools.concepts.Registration
\r
import org.opendaylight.yangtools.yang.binding.Notification
\r
import org.slf4j.LoggerFactory
\r
import org.opendaylight.yangtools.concepts.Registration
\r
import org.opendaylight.yangtools.yang.binding.Notification
\r
import org.slf4j.LoggerFactory
\r
-
\r
+import org.opendaylight.controller.sal.binding.codegen.impl.SingletonHolder
\r
import com.google.common.collect.Multimaps
+
class NotificationBrokerImpl implements NotificationProviderService, AutoCloseable {
\r
\r
val Multimap<Class<? extends Notification>, NotificationListener<?>> listeners;
\r
class NotificationBrokerImpl implements NotificationProviderService, AutoCloseable {
\r
\r
val Multimap<Class<? extends Notification>, NotificationListener<?>> listeners;
\r
@@
-29,8
+30,13
@@
class NotificationBrokerImpl implements NotificationProviderService, AutoCloseab
@Property
\r
var ExecutorService executor;
\r
\r
@Property
\r
var ExecutorService executor;
\r
\r
+ new() {
\r
+ listeners = Multimaps.synchronizedSetMultimap(HashMultimap.create())
\r
+ }
\r
+
\r
+ @Deprecated
\r
new(ExecutorService executor) {
\r
new(ExecutorService executor) {
\r
- listeners =
HashMultimap.create(
)
\r
+ listeners =
Multimaps.synchronizedSetMultimap(HashMultimap.create()
)
\r
this.executor = executor;
\r
}
\r
\r
this.executor = executor;
\r
}
\r
\r
@@
-100,7
+106,7
@@
class NotificationBrokerImpl implements NotificationProviderService, AutoCloseab
\r
override registerNotificationListener(
\r
org.opendaylight.yangtools.yang.binding.NotificationListener listener) {
\r
\r
override registerNotificationListener(
\r
org.opendaylight.yangtools.yang.binding.NotificationListener listener) {
\r
- val invoker =
BindingAwareBrokerImpl.generator.invokerFactory
.invokerFor(listener);
\r
+ val invoker =
SingletonHolder.INVOKER_FACTORY
.invokerFor(listener);
\r
for (notifyType : invoker.supportedNotifications) {
\r
listeners.put(notifyType, invoker.invocationProxy)
\r
}
\r
for (notifyType : invoker.supportedNotifications) {
\r
listeners.put(notifyType, invoker.invocationProxy)
\r
}
\r
@@
-169,14
+175,24
@@
class NotifyTask implements Callable<Object> {
\r
private static val log = LoggerFactory.getLogger(NotifyTask);
\r
\r
\r
private static val log = LoggerFactory.getLogger(NotifyTask);
\r
\r
+ @SuppressWarnings("rawtypes")
\r
val NotificationListener listener;
\r
val Notification notification;
\r
\r
override call() {
\r
val NotificationListener listener;
\r
val Notification notification;
\r
\r
override call() {
\r
+ //Only logging the complete notification in debug mode
\r
try {
\r
try {
\r
- log.info("Delivering notification {} to {}",notification,listener);
\r
+ if(log.isDebugEnabled){
\r
+ log.debug("Delivering notification {} to {}",notification,listener);
\r
+ } else {
\r
+ log.trace("Delivering notification {} to {}",notification.class.name,listener);
\r
+ }
\r
listener.onNotification(notification);
\r
listener.onNotification(notification);
\r
- log.info("Notification delivered {} to {}",notification,listener);
\r
+ if(log.isDebugEnabled){
\r
+ log.debug("Notification delivered {} to {}",notification,listener);
\r
+ } else {
\r
+ log.trace("Notification delivered {} to {}",notification.class.name,listener);
\r
+ }
\r
} catch (Exception e) {
\r
log.error("Unhandled exception thrown by listener: {}", listener, e);
\r
}
\r
} catch (Exception e) {
\r
log.error("Unhandled exception thrown by listener: {}", listener, e);
\r
}
\r