You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2017/10/15 00:02:20 UTC
juddi git commit: JUDDI-983 workaround JUDDI-981 attempting to fix
the build
Repository: juddi
Updated Branches:
refs/heads/master bfc210ad8 -> ee347328e
JUDDI-983 workaround
JUDDI-981 attempting to fix the build
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/ee347328
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/ee347328
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/ee347328
Branch: refs/heads/master
Commit: ee347328e430b966c27fc1c65723091e69b6acb4
Parents: bfc210a
Author: Alex O'Ree <al...@apache.org>
Authored: Sat Oct 14 20:02:18 2017 -0400
Committer: Alex O'Ree <al...@apache.org>
Committed: Sat Oct 14 20:02:18 2017 -0400
----------------------------------------------------------------------
.../apache/juddi/v3/client/cryptor/DigSigUtil.java | 16 +++++++++++-----
.../v3/tck/UDDI_070_FindEntityIntegrationTest.java | 5 +++--
2 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/ee347328/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java
----------------------------------------------------------------------
diff --git a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java
index b773c19..cbad43d 100644
--- a/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java
+++ b/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/DigSigUtil.java
@@ -537,12 +537,18 @@ public class DigSigUtil {
OutErrorMessage.set("Unable to verify certificate status from OCSP because the issuer of the certificate is not in the trust store. " + OutErrorMessage.get());
//throw new CertificateException("unable to locate the issuers certificate in the trust store");
} else {
- RevocationStatus check = OCSP.check(signingcert, issuer);
- logger.info("certificate " + signingcert.getSubjectDN().toString() + " revocation status is " + check.getCertStatus().toString() + " reason " + check.getRevocationReason().toString());
- if (check.getCertStatus() != RevocationStatus.CertStatus.GOOD) {
- OutErrorMessage.set("Certificate status is " + check.getCertStatus().toString() + " reason " + check.getRevocationReason().toString() + "." + OutErrorMessage.get());
+ try{
+ RevocationStatus check = OCSP.check(signingcert, issuer);
+ logger.info("certificate " + signingcert.getSubjectDN().toString() + " revocation status is " + check.getCertStatus().toString() + " reason " + check.getRevocationReason().toString());
+ if (check.getCertStatus() != RevocationStatus.CertStatus.GOOD) {
+ OutErrorMessage.set("Certificate status is " + check.getCertStatus().toString() + " reason " + check.getRevocationReason().toString() + "." + OutErrorMessage.get());
- //throw new CertificateException("Certificate status is " + check.getCertStatus().toString() + " reason " + check.getRevocationReason().toString());
+ //throw new CertificateException("Certificate status is " + check.getCertStatus().toString() + " reason " + check.getRevocationReason().toString());
+ }
+ } catch (Throwable t) {
+ //this looks dirty, and it is, however there are some API differences on certain JDKs
+ OutErrorMessage.set("Certificate status is unknown. Failed to check due to error: " + t.getMessage());
+ logger.warn("Certificate status is unknown. Failed to check due to error: " + t.getMessage());
}
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/ee347328/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
----------------------------------------------------------------------
diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
index 92ffb9a..5b7f2f5 100644
--- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
+++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
@@ -118,6 +118,7 @@ public class UDDI_070_FindEntityIntegrationTest {
Assume.assumeTrue(TckPublisher.isEnabled());
try {
tckTModel.saveUDDIPublisherTmodel(authInfoUddi);
+ tckTModel.saveTmodels(authInfoUddi);
tckTModel.saveJoePublisherTmodel(authInfoJoe, true);
tckBusiness.saveJoePublisherBusiness(authInfoJoe);
tckBusinessService.saveJoePublisherService(authInfoJoe);
@@ -129,10 +130,10 @@ public class UDDI_070_FindEntityIntegrationTest {
tckFindEntity.getNonExitingBusiness();
} catch (Exception e) {
e.printStackTrace();
- Assert.fail();
+ Assert.fail(e.getMessage());
} catch (Throwable t) {
t.printStackTrace();
- Assert.fail();
+ Assert.fail(t.getMessage());
} finally {
tckBindingTemplate.deleteJoePublisherBinding(authInfoJoe);
tckBusinessService.deleteJoePublisherService(authInfoJoe);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org