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

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

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

Modified Files:
	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.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ApacheXMLDSigner.java	31 Dec 2003 04:06:42 -0000	1.13
--- ApacheXMLDSigner.java	31 Dec 2003 05:02:23 -0000	1.14
***************
*** 499,502 ****
--- 499,503 ----
  
          Certificate[] certs = null;
+         double javaVersion = Version.getJDKVersion();
          if (certResolver != null) {
              certs = certResolver.resolve(obj);
***************
*** 504,513 ****
                  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;
          }
          KeyInfo keyInfo = null;
--- 505,514 ----
                  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);
          }
          KeyInfo keyInfo = null;
***************
*** 572,576 ****
          logger.debug("checked signature value, result: " + ret);
  
-         double javaVersion = Version.getJDKVersion();
  
          if (ret == true && trusted != null && certs != null 
--- 573,576 ----