summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java b/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
index 3c7e656053..e337e9fd05 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
@@ -241,7 +241,7 @@ public class BasicContentHeaderProperties implements ContentHeaderProperties
}
}
}
-
+
public void populatePropertiesFromBuffer(ByteBuffer buffer, int propertyFlags, int size)
throws AMQFrameDecodingException
{
@@ -402,6 +402,7 @@ public class BasicContentHeaderProperties implements ContentHeaderProperties
decodeUpToContentType();
}
}
+
public String getContentType()
{
decodeContentTypeIfNecessary();
@@ -431,6 +432,12 @@ public class BasicContentHeaderProperties implements ContentHeaderProperties
public FieldTable getHeaders()
{
decodeHeadersIfNecessary();
+
+ if (_headers == null)
+ {
+ _headers = new FieldTable();
+ }
+
return _headers;
}
@@ -587,6 +594,6 @@ public class BasicContentHeaderProperties implements ContentHeaderProperties
public String toString()
{
- return "reply-to = " + _replyTo + " propertyFlags = " + _propertyFlags;
+ return "reply-to = " + _replyTo + " propertyFlags = " + _propertyFlags;
}
}