mx4j/src/core/javax/management MBeanPermission.java,1.10,1.11

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

Modified Files:
	MBeanPermission.java 
Log Message:
Fix for [ 1121849 ] MBeanPermission 4-arg form, null is same as "-"
Simply forces null to be treated as "-"
"" is passed through and will be treated as "*"

Index: MBeanPermission.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/MBeanPermission.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MBeanPermission.java	9 Feb 2005 17:25:35 -0000	1.10
--- MBeanPermission.java	13 Feb 2005 16:43:01 -0000	1.11
***************
*** 93,112 ****
        StringBuffer target = new StringBuffer();
  
!       if (className != null) target.append(className);
! 
!       if (memberName != null)
!       {
!          target.append("#");
!          target.append(memberName);
!       }
! 
!       if (objectName != null)
!       {
!          target.append("[");
!          target.append(objectName.getCanonicalName());
!          target.append("]");
!       }
! 
!       if (target.length() == 0) return "-#-[-]";
  
        return target.toString();
--- 93,102 ----
        StringBuffer target = new StringBuffer();
  
!       target.append(className == null ? "-" : className);
!       target.append('#');
!       target.append(memberName == null ? "-" : memberName);
!       target.append('[');
!       target.append(objectName == null ? "-" : objectName.getCanonicalName());
!       target.append(']');
  
        return target.toString();



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