0003895: Compare Url's case insensitive

JumpMind · Apr 1, 2019 · 2a5ef65 · 2a5ef65
1 parent 87e54bb
commit 2a5ef65
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/job/PushHeartbeatListener.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/job/PushHeartbeatListener.java
@@ -58,7 +58,7 @@ public void heartbeat(Node me) {
             }
             if (!parameterService.getExternalId().equals(me.getExternalId())
                     || !parameterService.getNodeGroupId().equals(me.getNodeGroupId())
-                    || (parameterService.getSyncUrl() != null && !parameterService.getSyncUrl().equals(me.getSyncUrl()))
+                    || (parameterService.getSyncUrl() != null && !parameterService.getSyncUrl().equalsIgnoreCase(me.getSyncUrl()))
                     || !parameterService.getString(ParameterConstants.SCHEMA_VERSION, "").equals(me.getSchemaVersion())
                     || (engine.getDeploymentType() != null && !engine.getDeploymentType().equals(me.getDeploymentType()))
                     || !Version.version().equals(me.getSymmetricVersion())

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java
@@ -344,7 +344,7 @@ public void loadDataFromPull(Node remote, RemoteNodeStatus status) throws IOExce
 
         } catch (RegistrationRequiredException e) {
             if (StringUtils.isBlank(remote.getSyncUrl())
-                    || remote.getSyncUrl().equals(parameterService.getRegistrationUrl())) {
+                    || remote.getSyncUrl().equalsIgnoreCase(parameterService.getRegistrationUrl())) {
                 log.warn("Node information missing on the server.  Attempting to re-register remote.getSyncUrl()={}", remote.getSyncUrl());
                 loadDataFromPull(null, status);
                 nodeService.findIdentity(false);

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterService.java
@@ -171,7 +171,7 @@ public Object mapRow(Row row) {
 
     public boolean isRegistrationServer() {
         return StringUtils.isBlank(getRegistrationUrl())
-                || getRegistrationUrl().equals(getSyncUrl());
+                || getRegistrationUrl().equalsIgnoreCase(getSyncUrl());
     }