You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/03/26 05:58:46 UTC

[GitHub] jai1 closed pull request #1425: Using correct flag (isReplicationTlsEnabled) for redirection for dele���

jai1 closed pull request #1425: Using correct flag (isReplicationTlsEnabled) for redirection for dele…
URL: https://github.com/apache/incubator-pulsar/pull/1425
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
index 5f5b75861..c8adfb49d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
@@ -145,7 +145,7 @@ protected void internalDeleteNamespace(boolean authoritative) {
                             .orElseThrow(() -> new RestException(Status.NOT_FOUND,
                                     "Cluster " + replCluster + " does not exist"));
                     URL replClusterUrl;
-                    if (!config().isTlsEnabled()) {
+                    if (!config().isReplicationTlsEnabled()) {
                         replClusterUrl = new URL(replClusterData.getServiceUrl());
                     } else if (!replClusterData.getServiceUrlTls().isEmpty()) {
                         replClusterUrl = new URL(replClusterData.getServiceUrlTls());
@@ -246,7 +246,7 @@ protected void internalDeleteNamespaceBundle(String bundleRange, boolean authori
                             .orElseThrow(() -> new RestException(Status.NOT_FOUND,
                                     "Cluser " + replCluster + " does not exist"));
                     URL replClusterUrl;
-                    if (!config().isTlsEnabled()) {
+                    if (!config().isReplicationTlsEnabled()) {
                         replClusterUrl = new URL(replClusterData.getServiceUrl());
                     } else if (!replClusterData.getServiceUrlTls().isEmpty()) {
                         replClusterUrl = new URL(replClusterData.getServiceUrlTls());


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services