Author: gnodet
Date: Mon May 21 22:54:06 2012
New Revision: 1341249
URL: http://svn.apache.org/viewvc?rev=1341249&view=rev
Log:
ARIES-782 Use trackedId instead of tracking count to see whether the service
has already been registered
Modified:
aries/branches/blueprint-0.3.2-fixes/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java
Modified:
aries/branches/blueprint-0.3.2-fixes/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java
URL:
http://svn.apache.org/viewvc/aries/branches/blueprint-0.3.2-fixes/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java?rev=1341249&r1=1341248&r2=1341249&view=diff
==============================================================================
---
aries/branches/blueprint-0.3.2-fixes/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java
(original)
+++
aries/branches/blueprint-0.3.2-fixes/jmx-core/src/main/java/org/apache/aries/jmx/AbstractCompendiumHandler.java
Mon May 21 22:54:06 2012
@@ -76,8 +76,8 @@ public abstract class AbstractCompendium
Long serviceId = (Long) reference.getProperty(Constants.SERVICE_ID);
//API stipulates versions for compendium services with static
ObjectName
//This shouldn't happen but added as a consistency check
- if (getTrackingCount() > 0) {
- String serviceDescription = (String)
((reference.getProperty(Constants.SERVICE_DESCRIPTION) != null) ?
+ if (trackedId != null) {
+ String serviceDescription = (String)
((reference.getProperty(Constants.SERVICE_DESCRIPTION) != null) ?
reference.getProperty(Constants.SERVICE_DESCRIPTION) :
reference.getProperty(Constants.OBJECTCLASS));
logger.log(LogService.LOG_WARNING, "Detected secondary
ServiceReference for [" + serviceDescription
+ "] with " + Constants.SERVICE_ID + " [" + serviceId + "]
Only 1 instance will be JMX managed");
