[activemq] branch main updated: [AMQ-8493] Minor deprecation cleanups in activemq-client

[cshannon]

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

cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/main by this push:
     new 00925c1  [AMQ-8493] Minor deprecation cleanups in activemq-client
     new bed86a0  Merge pull request #770 from mattrpav/AMQ-8493
00925c1 is described below

commit 00925c1eff7a465710553263d8728265cf87ae13
Author: Matt Pavlovich <m...@hyte.io>
AuthorDate: Wed Feb 16 12:58:29 2022 -0600

    [AMQ-8493] Minor deprecation cleanups in activemq-client
---
 .../main/java/org/apache/activemq/ActiveMQConnectionMetaData.java | 2 +-
 .../src/main/java/org/apache/activemq/command/Message.java        | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
index 38c9761..1f0f765 100644
--- 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
@@ -43,7 +43,7 @@ public final class ActiveMQConnectionMetaData implements 
ConnectionMetaData {
         int major = 0;
         int minor = 0;
         try {
-            Package p = Package.getPackage("org.apache.activemq");
+            Package p = ActiveMQConnectionMetaData.class.getPackage();
             if (p != null) {
                 version = p.getImplementationVersion();
                 if (version != null) {
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/command/Message.java 
b/activemq-client/src/main/java/org/apache/activemq/command/Message.java
index 44f8094..e74e1f3 100644
--- a/activemq-client/src/main/java/org/apache/activemq/command/Message.java
+++ b/activemq-client/src/main/java/org/apache/activemq/command/Message.java
@@ -111,14 +111,6 @@ public abstract class Message extends BaseCommand 
implements MarshallAware, Mess
     public abstract void storeContent();
     public abstract void storeContentAndClear();
 
-    /**
-     * @deprecated - This method name is misnamed
-     * @throws JMSException
-     */
-    public void clearMarshalledState() throws JMSException {
-        clearUnMarshalledState();
-    }
-
     // useful to reduce the memory footprint of a persisted message
     public void clearUnMarshalledState() throws JMSException {
         properties = null;