mx4j/src/core/javax/management/relation RelationService.java,1.34,1.35

Update of /cvsroot/mx4j/mx4j/src/core/javax/management/relation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26318/src/core/javax/management/relation

Modified Files:
	RelationService.java 
Log Message:
Fix for [ 1121973 ] An MBean can be in multiple relations

Index: RelationService.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/relation/RelationService.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** RelationService.java	13 Feb 2005 20:51:43 -0000	1.34
--- RelationService.java	13 Feb 2005 21:13:38 -0000	1.35
***************
*** 1150,1156 ****
           mbeanReferenceMap = new HashMap();
        }
!       if (mbeanReferenceMap.get(relationId) == null)
        {
!          ArrayList roleNames = new ArrayList();
           roleNames.add(roleName);
  
--- 1150,1157 ----
           mbeanReferenceMap = new HashMap();
        }
!       List roleNames = (List) mbeanReferenceMap.get(relationId);
!       if (roleNames == null)
        {
!          roleNames = new ArrayList();
           roleNames.add(roleName);
  
***************
*** 1159,1164 ****
           return true;
        }
!       // not a new MBeanReference return false
!       return false;
     }
  
--- 1160,1170 ----
           return true;
        }
!       else
!       {
!          roleNames.add(roleName);
!          addObjectNameToMBeanReference(objectName, mbeanReferenceMap);
!          // not a new MBeanReference return false
!          return false;
!       }
     }
  
***************
*** 1693,1699 ****
              if (!(objectName.equals(mbeanObjectName)))
              {
!                ArrayList currentRelationIdList = new ArrayList();
                 currentRelationIdList.add(currentRelationId);
-                result.put(objectName, currentRelationIdList);
              }
           }
--- 1699,1709 ----
              if (!(objectName.equals(mbeanObjectName)))
              {
!                ArrayList currentRelationIdList = (ArrayList) result.get(objectName);
!                if (currentRelationIdList == null)
!                {
!                   currentRelationIdList = new ArrayList();
!                   result.put(objectName, currentRelationIdList);
!                }
                 currentRelationIdList.add(currentRelationId);
              }
           }



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click