mx4j/src/core/javax/management/relation RelationService.java,1.26,1.27

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

Modified Files:
	RelationService.java 
Log Message:
Fixes for addNewMBeanReference() bug 575066

Index: RelationService.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/relation/RelationService.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** RelationService.java	22 Feb 2004 17:52:11 -0000	1.26
--- RelationService.java	14 May 2004 16:05:15 -0000	1.27
***************
*** 9,18 ****
  package javax.management.relation;
  
  import mx4j.log.Log;
  import mx4j.log.Logger;
  
- import javax.management.*;
- import java.util.*;
- 
  /**
   * @author <a href="mailto:[email protected]">Bronwen Cassidy</a>
--- 9,36 ----
  package javax.management.relation;
  
+ import java.util.ArrayList;
+ import java.util.Date;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+ 
+ import javax.management.InstanceNotFoundException;
+ import javax.management.MBeanNotificationInfo;
+ import javax.management.MBeanRegistration;
+ import javax.management.MBeanServer;
+ import javax.management.MBeanServerInvocationHandler;
+ import javax.management.MBeanServerNotification;
+ import javax.management.MalformedObjectNameException;
+ import javax.management.Notification;
+ import javax.management.NotificationBroadcasterSupport;
+ import javax.management.NotificationListener;
+ import javax.management.ObjectName;
+ import javax.management.RuntimeOperationsException;
+ 
  import mx4j.log.Log;
  import mx4j.log.Logger;
  
  /**
   * @author <a href="mailto:[email protected]">Bronwen Cassidy</a>
***************
*** 1094,1098 ****
  			throws IllegalArgumentException
  	{
! 		if(relationId == null) throw new IllegalArgumentException("Null Relation Id");
  		if(roleName == null) throw new IllegalArgumentException("Null Role Name");
  		if(objectName == null) throw new IllegalArgumentException("Null ObjectName.");
--- 1112,1116 ----
  			throws IllegalArgumentException
  	{
! 	    if(relationId == null) throw new IllegalArgumentException("Null Relation Id");
  		if(roleName == null) throw new IllegalArgumentException("Null Role Name");
  		if(objectName == null) throw new IllegalArgumentException("Null ObjectName.");
***************
*** 1107,1113 ****
  		if(mbeanReferenceMap == null)
  		{
  			ArrayList roleNames = new ArrayList();
  			roleNames.add(roleName);
! 			mbeanReferenceMap = new HashMap();
  			mbeanReferenceMap.put(relationId, roleNames);
  			addObjectNameToMBeanReference(objectName, mbeanReferenceMap);
--- 1125,1135 ----
  		if(mbeanReferenceMap == null)
  		{
+ 			mbeanReferenceMap = new HashMap();
+ 		}
+ 		if(mbeanReferenceMap.get(relationId) == null)
+ 		{
  			ArrayList roleNames = new ArrayList();
  			roleNames.add(roleName);
! 			
  			mbeanReferenceMap.put(relationId, roleNames);
  			addObjectNameToMBeanReference(objectName, mbeanReferenceMap);



-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click