mx4j/src/test/test/javax/management/compliance/signature/support SignatureVerifier.java,1.2,1.3

Update of /cvsroot/mx4j/mx4j/src/test/test/javax/management/compliance/signature/support
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14385/src/test/test/javax/management/compliance/signature/support

Modified Files:
	SignatureVerifier.java 
Log Message:
Fixed bug: early warnings stopped the verification, hiding errors

Index: SignatureVerifier.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/test/test/javax/management/compliance/signature/support/SignatureVerifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SignatureVerifier.java	10 Aug 2004 09:15:17 -0000	1.2
--- SignatureVerifier.java	28 Aug 2004 14:26:14 -0000	1.3
***************
*** 34,51 ****
        boolean isSerializable = Serializable.class.isAssignableFrom(jmxriClass);
  
!       checkSameClassModifiers(jmxriClass, mx4jClass);
!       checkSameInheritance(jmxriClass, mx4jClass);
  
        if (!isPackage)
        {
!          checkSameConstructors(jmxriClass, mx4jClass);
!          checkSameMethods(jmxriClass, mx4jClass);
!          checkSameFields(jmxriClass, mx4jClass);
        }
  
        if (isSerializable)
        {
!          checkSameSerialVersionUID(jmxriClass, mx4jClass);
        }
     }
  
--- 34,98 ----
        boolean isSerializable = Serializable.class.isAssignableFrom(jmxriClass);
  
!       NotCompliantWarningException warning = null;
! 
!       try
!       {
!          checkSameClassModifiers(jmxriClass, mx4jClass);
!       }
!       catch (NotCompliantWarningException x)
!       {
!          warning = x;
!       }
! 
!       try
!       {
!          checkSameInheritance(jmxriClass, mx4jClass);
!       }
!       catch (NotCompliantWarningException x)
!       {
!          warning = x;
!       }
  
        if (!isPackage)
        {
!          try
!          {
!             checkSameConstructors(jmxriClass, mx4jClass);
!          }
!          catch (NotCompliantWarningException x)
!          {
!             warning = x;
!          }
!          try
!          {
!             checkSameMethods(jmxriClass, mx4jClass);
!          }
!          catch (NotCompliantWarningException x)
!          {
!             warning = x;
!          }
!          try
!          {
!             checkSameFields(jmxriClass, mx4jClass);
!          }
!          catch (NotCompliantWarningException x)
!          {
!             warning = x;
!          }
        }
  
        if (isSerializable)
        {
!          try
!          {
!             checkSameSerialVersionUID(jmxriClass, mx4jClass);
!          }
!          catch (NotCompliantWarningException x)
!          {
!             warning = x;
!          }
        }
+ 
+       if (warning != null) throw warning;
     }
  



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click