Merge pull request #19 from AxonFramework/fix/eureka_registration

[#18] Instance registration fails with Eureka
AxonFramework · Apr 21, 2020 · ac1fe09 · ac1fe09
2 parents 50a95c3 + aaf5006
commit ac1fe09
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...va/org/axonframework/extensions/springcloud/commandhandling/SpringCloudCommandRouter.java b/...va/org/axonframework/extensions/springcloud/commandhandling/SpringCloudCommandRouter.java
@@ -135,7 +135,7 @@ public static Builder builder() {
      */
     public static boolean serviceInstanceMetadataContainsMessageRoutingInformation(ServiceInstance serviceInstance) {
         Map<String, String> serviceInstanceMetadata = serviceInstance.getMetadata();
-        return serviceInstanceMetadata != null && 
+        return serviceInstanceMetadata != null &&
                 serviceInstanceMetadata.containsKey(LOAD_FACTOR) &&
                 serviceInstanceMetadata.containsKey(SERIALIZED_COMMAND_FILTER) &&
                 serviceInstanceMetadata.containsKey(SERIALIZED_COMMAND_FILTER_CLASS_NAME);
@@ -325,11 +325,10 @@ private boolean isLocalServiceInstance(ServiceInstance serviceInstance) {
 
     private Member buildLocalMember(ServiceInstance localServiceInstance) {
         String localServiceId = localServiceInstance.getServiceId();
-        URI serviceWithContextRootUri = buildRemoteUriWithContextRoot(localServiceInstance);
         URI emptyEndpoint = null;
         //noinspection ConstantConditions | added null variable for clarity
         return registered
-                ? new SimpleMember<>(buildSimpleMemberName(localServiceId, serviceWithContextRootUri),
+                ? new SimpleMember<>(buildSimpleMemberName(localServiceId, buildRemoteUriWithContextRoot(localServiceInstance)),
                                      localServiceInstance.getUri(),
                                      SimpleMember.LOCAL_MEMBER,
                                      this::suspect)