Author: robbie
Date: Wed Jul 2 12:20:39 2014
New Revision: 1607339
URL: http://svn.apache.org/r1607339
Log:
NO-JIRA: fix compilation following changes on proton trunk
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMessage.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpMessageTest.java
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMessage.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMessage.java?rev=1607339&r1=1607338&r2=1607339&view=diff
==============================================================================
--- qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMessage.java
(original)
+++ qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMessage.java
Wed Jul 2 12:20:39 2014
@@ -51,7 +51,7 @@ public abstract class AmqpMessage
private final AmqpConnection _amqpConnection;
private volatile MessageAnnotations _messageAnnotations;
- private volatile Map<Object,Object> _messageAnnotationsMap;
+ private volatile Map<Symbol,Object> _messageAnnotationsMap;
private volatile Map<String,Object> _applicationPropertiesMap;
@@ -316,7 +316,7 @@ public abstract class AmqpMessage
private void initializeUnderlyingMessageAnnotations()
{
- _messageAnnotationsMap = new HashMap<Object,Object>();
+ _messageAnnotationsMap = new HashMap<Symbol,Object>();
_messageAnnotations = new MessageAnnotations(_messageAnnotationsMap);
_message.setMessageAnnotations(_messageAnnotations);
}
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpMessageTest.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpMessageTest.java?rev=1607339&r1=1607338&r2=1607339&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpMessageTest.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpMessageTest.java
Wed Jul 2 12:20:39 2014
@@ -1287,7 +1287,7 @@ public class AmqpMessageTest extends Qpi
Message message = Proton.message();
- Map<Object,Object> annotationsMap = new HashMap<Object,Object>();
+ Map<Symbol,Object> annotationsMap = new HashMap<Symbol,Object>();
annotationsMap.put(Symbol.valueOf(symbolKeyName), value);
message.setMessageAnnotations(new MessageAnnotations(annotationsMap));
@@ -1317,7 +1317,7 @@ public class AmqpMessageTest extends Qpi
Message message = Proton.message();
- Map<Object,Object> annotationsMap = new HashMap<Object,Object>();
+ Map<Symbol,Object> annotationsMap = new HashMap<Symbol,Object>();
annotationsMap.put(Symbol.valueOf(symbolKeyName), value);
message.setMessageAnnotations(new MessageAnnotations(annotationsMap));
@@ -1371,7 +1371,7 @@ public class AmqpMessageTest extends Qpi
Message message = Proton.message();
- Map<Object,Object> annotationsMap = new HashMap<Object,Object>();
+ Map<Symbol,Object> annotationsMap = new HashMap<Symbol,Object>();
annotationsMap.put(Symbol.valueOf(symbolKeyName), value);
message.setMessageAnnotations(new MessageAnnotations(annotationsMap));
@@ -1414,7 +1414,7 @@ public class AmqpMessageTest extends Qpi
Message message = Proton.message();
- Map<Object,Object> annotationsMap = new HashMap<Object,Object>();
+ Map<Symbol,Object> annotationsMap = new HashMap<Symbol,Object>();
annotationsMap.put(Symbol.valueOf(symbolKeyName), value);
message.setMessageAnnotations(new MessageAnnotations(annotationsMap));
@@ -1444,7 +1444,7 @@ public class AmqpMessageTest extends Qpi
Message message = Proton.message();
- Map<Object,Object> annotationsMap = new HashMap<Object,Object>();
+ Map<Symbol,Object> annotationsMap = new HashMap<Symbol,Object>();
annotationsMap.put(Symbol.valueOf(symbolKeyName), value);
annotationsMap.put(Symbol.valueOf(symbolKeyName2), value);
message.setMessageAnnotations(new MessageAnnotations(annotationsMap));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
