You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/17 01:34:16 UTC
[10/12] incubator-trafficcontrol git commit: Fix TC-43: TR prints 'No
certificate data for https' for a ds with cert
Fix TC-43: TR prints 'No certificate data for https' for a ds with cert
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5c7bc65f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5c7bc65f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5c7bc65f
Branch: refs/heads/psql-rebase
Commit: 5c7bc65f2bec66fe2dffadeac71f958e742cdba3
Parents: 8586608
Author: John Shen <we...@cisco.com>
Authored: Tue Nov 15 06:02:14 2016 -0500
Committer: Eric Friedrich <ef...@cisco.com>
Committed: Tue Nov 15 20:03:29 2016 -0500
----------------------------------------------------------------------
.../traffic_router/core/config/CertificateChecker.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5c7bc65f/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
----------------------------------------------------------------------
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
index f6601c9..928b926 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/config/CertificateChecker.java
@@ -77,8 +77,6 @@ public class CertificateChecker {
return true;
}
- boolean hasValidCertificates = false;
-
for (int i = 0; i < domains.length(); i++) {
final String domain = domains.optString(i, "").replaceAll("^\\*\\.", "");
if (domain == null || domain.isEmpty()) {
@@ -87,13 +85,14 @@ public class CertificateChecker {
for (final CertificateData certificateData : certificateDataList) {
if (certificateData.getDeliveryservice().equals(deliveryServiceId)) {
- hasValidCertificates = true;
+ LOGGER.debug("Delivery Service " + deliveryServiceId + " has certificate data for https");
+ return true;
}
}
LOGGER.error("No certificate data for https " + deliveryServiceId + " domain " + domain);
}
- return hasValidCertificates;
+ return false;
}
private boolean supportsHttps(final JSONObject deliveryServiceJson, final JSONObject protocolJson) {