This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new d0afa6a  NO-JIRA remove stale notification property
     new 5d6a534  This closes #3050
d0afa6a is described below

commit d0afa6a7e63104d1d719ffd2e023a9dcfe327426
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Wed Mar 25 10:42:03 2020 -0500

    NO-JIRA remove stale notification property
    
    This appears to have been added to the code-base by mistake over 10
    years ago. It seems related to debugging and I can't see anywhere where
    it is actually used so I'm removing it.
---
 .../apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java  | 4 ----
 .../artemis/core/server/management/impl/ManagementServiceImpl.java    | 4 ----
 2 files changed, 8 deletions(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
index 446ae84..dfb8c1c 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
@@ -1686,13 +1686,9 @@ public class PostOfficeImpl implements PostOffice, 
NotificationListener, Binding
 
       message.setAddress(queueName);
 
-      String uid = UUIDGenerator.getInstance().generateStringUUID();
-
       message.putStringProperty(ManagementHelper.HDR_NOTIFICATION_TYPE, new 
SimpleString(type.toString()));
       message.putLongProperty(ManagementHelper.HDR_NOTIFICATION_TIMESTAMP, 
System.currentTimeMillis());
 
-      message.putStringProperty(new SimpleString("foobar"), new 
SimpleString(uid));
-
       return message;
    }
 
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
index 958f9ed..00bc3f5 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
@@ -693,10 +693,6 @@ public class ManagementServiceImpl implements 
ManagementService {
 
                
notificationMessage.putLongProperty(ManagementHelper.HDR_NOTIFICATION_TIMESTAMP,
 System.currentTimeMillis());
 
-               if (notification.getUID() != null) {
-                  notificationMessage.putStringProperty(new 
SimpleString("foobar"), new SimpleString(notification.getUID()));
-               }
-
                postOffice.route(notificationMessage, false);
             }
          }

Reply via email to