[ebxmlms-commits] ebxmlms/src/hk/hku/cecid/phoenix/pki ApacheXMLDSigner.java,1.4.2.6,1.4.2.7

[<bob...@us...>]

Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki
In directory sc8-pr-cvs1:/tmp/cvs-serv7530/src/hk/hku/cecid/phoenix/pki

Modified Files:
      Tag: b0931
	ApacheXMLDSigner.java 
Log Message:
fix compilation bug on ApacheXMLDSigner.java

Index: ApacheXMLDSigner.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/pki/ApacheXMLDSigner.java,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -C2 -d -r1.4.2.6 -r1.4.2.7
*** ApacheXMLDSigner.java	31 Dec 2003 03:02:24 -0000	1.4.2.6
--- ApacheXMLDSigner.java	31 Dec 2003 04:47:07 -0000	1.4.2.7
***************
*** 473,476 ****
--- 473,477 ----
  
          Certificate[] certs = null;
+         double javaVersion = Version.getJDKVersion();
          if (certResolver != null) {
              certs = certResolver.resolve(obj);
***************
*** 478,487 ****
                  String err = "Certificates returned by certResolver is null";
                  logger.warn(err);
!                 throws new VerifyException(err);
              }
          } else if (trusted == null || javaVersion < 1.4) {
              String err = "Cannot verify cert path, but certResolver is null";
              logger.warn(err);
!             throws new VerifyException;
          }
          
--- 479,488 ----
                  String err = "Certificates returned by certResolver is null";
                  logger.warn(err);
!                 throw new VerifyException(err);
              }
          } else if (trusted == null || javaVersion < 1.4) {
              String err = "Cannot verify cert path, but certResolver is null";
              logger.warn(err);
!             throw new VerifyException(err);
          }
          
***************
*** 547,551 ****
          logger.debug("checked signature value, result: " + ret);
  
-         double javaVersion = Version.getJDKVersion();
  
          if (ret == true && trusted != null && certs != null 
--- 548,551 ----