Author: kkolinko
Date: Sun Apr 13 10:59:37 2014
New Revision: 1586960
URL: http://svn.apache.org/r1586960
Log:
Merged r1586959 from tomcat/trunk:
Followup to r1586897 :
Apply the same not-null optimization to
removeAttributeChangeNotificationListener method.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1586959
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=1586960&r1=1586959&r2=1586960&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
Sun Apr 13 10:59:37 2014
@@ -625,11 +625,11 @@ public class BaseModelMBean implements D
if (listener == null)
throw new IllegalArgumentException("Listener is null");
- if (attributeBroadcaster == null)
- attributeBroadcaster = new BaseNotificationBroadcaster();
// FIXME - currently this removes *all* notifications for this listener
- attributeBroadcaster.removeNotificationListener(listener);
+ if (attributeBroadcaster != null) {
+ attributeBroadcaster.removeNotificationListener(listener);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
