mx4j/src/core/javax/management/relation RelationSupport.java,1.16,1.17 RoleUnresolved.java,1.9,1.10

Jeremy Boynes <[email protected]> Sun, 13 Feb 2005 21:02:59 +0000
Newsgroups gmane.comp.java.mx4j.cvs
Message-ID <[email protected]>
Update of /cvsroot/mx4j/mx4j/src/core/javax/management/relation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21806/src/core/javax/management/relation

Modified Files:
	RelationSupport.java RoleUnresolved.java 
Log Message:
Fix for [ 1121970 ] setRoles returns wrong value; NPE in getRoles

Index: RelationSupport.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/relation/RelationSupport.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** RelationSupport.java	13 Feb 2005 20:56:06 -0000	1.16
--- RelationSupport.java	13 Feb 2005 21:02:56 -0000	1.17
***************
*** 275,279 ****
           }
        }
!       return (new RoleResult(roleList, roleUnresolvedList));
     }
  
--- 275,279 ----
           }
        }
!       return (new RoleResult(newRoleList, roleUnresolvedList));
     }
  

Index: RoleUnresolved.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/relation/RoleUnresolved.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RoleUnresolved.java	13 Nov 2004 16:38:49 -0000	1.9
--- RoleUnresolved.java	13 Feb 2005 21:02:56 -0000	1.10
***************
*** 82,96 ****
     public Object clone()
     {
!       try
!       {
!          RoleUnresolved tempRole = (RoleUnresolved)super.clone();
!          // getRoleValue() returns a copy
!          tempRole.roleValue = getRoleValue();
!          return tempRole;
!       }
!       catch (CloneNotSupportedException ignored)
!       {
!          return null;
!       }
     }
  
--- 82,87 ----
     public Object clone()
     {
!       // NB we do not (and cannot) implement Cloneable so we do our own copy
!       return new RoleUnresolved(roleName, roleValue, problemType);
     }
  



-------------------------------------------------------
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