mx4j/src/core/javax/management/modelmbean ModelMBeanAttributeInfo.java,1.13,1.14 ModelMBeanConstructorInfo.java,1.12,1.13 ModelMBeanInfoSupport.java,1.15,1.16 ModelMBeanNotificationInfo.java,1.10,1.11 ModelMBeanOperationInfo.java,1.9,1.10

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

Modified Files:
	ModelMBeanAttributeInfo.java ModelMBeanConstructorInfo.java 
	ModelMBeanInfoSupport.java ModelMBeanNotificationInfo.java 
	ModelMBeanOperationInfo.java 
Log Message:
Fixed check for descriptors, that was broken by the fix for bug #938635: DescriptorSupport did not preserve field case

Index: ModelMBeanNotificationInfo.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/modelmbean/ModelMBeanNotificationInfo.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ModelMBeanNotificationInfo.java	5 Oct 2004 14:46:47 -0000	1.10
--- ModelMBeanNotificationInfo.java	5 Oct 2004 17:06:58 -0000	1.11
***************
*** 9,14 ****
  package javax.management.modelmbean;
  
- import java.util.Arrays;
- import java.util.List;
  import javax.management.Descriptor;
  import javax.management.DescriptorAccess;
--- 9,12 ----
***************
*** 107,119 ****
  
        // Mandatory fields are: name, descriptorType, severity, messageId(?), log(?), logFile(?)
!       List names = Arrays.asList(descriptor.getFieldNames());
  
!       // Remember that names are lower case
!       if (!names.contains("name") ||
!           !names.contains("descriptortype") ||
!           !names.contains("severity")/* ||
!          !names.contains("messageid") ||
!          !names.contains("log")/* ||
!          !names.contains("logfile")*/)
        {
           return false;
--- 105,116 ----
  
        // Mandatory fields are: name, descriptorType, severity, messageId(?), log(?), logFile(?)
!       String[] names = descriptor.getFieldNames();
  
!       if (!ModelMBeanInfoSupport.containsIgnoreCase(names, "name") ||
!           !ModelMBeanInfoSupport.containsIgnoreCase(names, "descriptortype") ||
!           !ModelMBeanInfoSupport.containsIgnoreCase(names, "severity")/* ||
!          !ModelMBeanInfoSupport.containsIgnoreCase(names, "messageid") ||
!          !ModelMBeanInfoSupport.containsIgnoreCase(names, "log")/* ||
!          !ModelMBeanInfoSupport.containsIgnoreCase(names, "logfile")*/)
        {
           return false;

Index: ModelMBeanOperationInfo.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/modelmbean/ModelMBeanOperationInfo.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ModelMBeanOperationInfo.java	5 Oct 2004 14:46:47 -0000	1.9
--- ModelMBeanOperationInfo.java	5 Oct 2004 17:06:58 -0000	1.10
***************
*** 10,15 ****
  
  import java.lang.reflect.Method;
- import java.util.Arrays;
- import java.util.List;
  import javax.management.Descriptor;
  import javax.management.DescriptorAccess;
--- 10,13 ----
***************
*** 118,127 ****
  
        // Mandatory fields are: name, descriptorType, role, lastReturnedTimeStamp(?)
!       List names = Arrays.asList(descriptor.getFieldNames());
  
!       // Remember that names are lower case
!       if (!names.contains("name") ||
!           !names.contains("descriptortype") ||
!           !names.contains("role"))
        {
           return false;
--- 116,124 ----
  
        // Mandatory fields are: name, descriptorType, role, lastReturnedTimeStamp(?)
!       String[] names = descriptor.getFieldNames();
  
!       if (!ModelMBeanInfoSupport.containsIgnoreCase(names, "name") ||
!           !ModelMBeanInfoSupport.containsIgnoreCase(names, "descriptortype") ||
!           !ModelMBeanInfoSupport.containsIgnoreCase(names, "role"))
        {
           return false;

Index: ModelMBeanConstructorInfo.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/modelmbean/ModelMBeanConstructorInfo.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ModelMBeanConstructorInfo.java	5 Oct 2004 14:46:47 -0000	1.12
--- ModelMBeanConstructorInfo.java	5 Oct 2004 17:06:57 -0000	1.13
***************
*** 10,15 ****
  
  import java.lang.reflect.Constructor;
- import java.util.Arrays;
- import java.util.List;
  import javax.management.Descriptor;
  import javax.management.DescriptorAccess;
--- 10,13 ----
***************
*** 119,134 ****
  
        // Mandatory fields are: name, descriptorType, role
!       List names = Arrays.asList(descriptor.getFieldNames());
  
!       // Remember that names are lower case
!       if (!names.contains("name") ||
!           !names.contains("descriptortype") ||
!           !names.contains("role"))
        {
           return false;
        }
  
!       if (names.contains("persistpolicy") ||
!           names.contains("currencytimelimit"))
        {
           return false;
--- 117,131 ----
  
        // Mandatory fields are: name, descriptorType, role
!       String[] names = descriptor.getFieldNames();
  
!       if (!ModelMBeanInfoSupport.containsIgnoreCase(names, "name") ||
!           !ModelMBeanInfoSupport.containsIgnoreCase(names, "descriptortype") ||
!           !ModelMBeanInfoSupport.containsIgnoreCase(names, "role"))
        {
           return false;
        }
  
!       if (ModelMBeanInfoSupport.containsIgnoreCase(names, "persistpolicy") ||
!           ModelMBeanInfoSupport.containsIgnoreCase(names, "currencytimelimit"))
        {
           return false;

Index: ModelMBeanAttributeInfo.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/modelmbean/ModelMBeanAttributeInfo.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ModelMBeanAttributeInfo.java	5 Oct 2004 14:46:47 -0000	1.13
--- ModelMBeanAttributeInfo.java	5 Oct 2004 17:06:57 -0000	1.14
***************
*** 10,15 ****
  
  import java.lang.reflect.Method;
- import java.util.Arrays;
- import java.util.List;
  import javax.management.Descriptor;
  import javax.management.DescriptorAccess;
--- 10,13 ----
***************
*** 119,127 ****
  
        // Mandatory fields are: name, descriptorType
!       List names = Arrays.asList(descriptor.getFieldNames());
  
!       // Remember that names are lower case
!       if (!names.contains("name") ||
!           !names.contains("descriptortype"))
        {
           return false;
--- 117,124 ----
  
        // Mandatory fields are: name, descriptorType
!       String[] names = descriptor.getFieldNames();
  
!       if (!ModelMBeanInfoSupport.containsIgnoreCase(names, "name") ||
!           !ModelMBeanInfoSupport.containsIgnoreCase(names, "descriptortype"))
        {
           return false;

Index: ModelMBeanInfoSupport.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/modelmbean/ModelMBeanInfoSupport.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ModelMBeanInfoSupport.java	5 Oct 2004 14:46:47 -0000	1.15
--- ModelMBeanInfoSupport.java	5 Oct 2004 17:06:57 -0000	1.16
***************
*** 637,649 ****
  
        // Mandatory fields are: name, descriptorType, persistLocation(?), persistName(?), log(?), logFile(?)
!       List names = Arrays.asList(descriptor.getFieldNames());
  
!       // Remember that names are lower case
!       if (!names.contains("name") ||
!           !names.contains("descriptortype")/* ||
!          !names.contains("persistlocation") ||
!          !names.contains("persistname") ||
!          !names.contains("log") ||
!          !names.contains("logfile")*/)
        {
           return false;
--- 637,648 ----
  
        // Mandatory fields are: name, descriptorType, persistLocation(?), persistName(?), log(?), logFile(?)
!       String[] names = descriptor.getFieldNames();
  
!       if (!containsIgnoreCase(names, "name") ||
!           !containsIgnoreCase(names, "descriptortype")/* ||
!          !containsIgnoreCase(names, "persistlocation") ||
!          !containsIgnoreCase(names, "persistname") ||
!          !containsIgnoreCase(names, "log") ||
!          !containsIgnoreCase(names, "logfile")*/)
        {
           return false;
***************
*** 721,723 ****
--- 720,731 ----
        return result;
     }
+ 
+    static boolean containsIgnoreCase(String[] fields, String field)
+    {
+       for (int i = 0; i < fields.length; ++i)
+       {
+          if (fields[i].equalsIgnoreCase(field)) return true;
+       }
+       return false;
+    }
  }



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl