1 files changed, 8 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 a6883917d5..eb528159c0 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
@@ -88,7 +88,7 @@ public class BasicContentHeaderProperties implements CommonContentHeaderProperti
 
     public int getPropertyListSize()
     {
-        if(_encodedForm != null && (_headers == null || _headers.isClean()))
+        if(useEncodedForm())
         {
             return _encodedForm.length;
         }
@@ -189,7 +189,7 @@ public class BasicContentHeaderProperties implements CommonContentHeaderProperti
 
     public void writePropertyListPayload(DataOutput buffer) throws IOException
     {
-        if(_encodedForm != null && (_headers == null || !_headers.isClean()))
+        if(useEncodedForm())
         {
             buffer.write(_encodedForm);
         }
@@ -652,4 +652,10 @@ public class BasicContentHeaderProperties implements CommonContentHeaderProperti
             + _expiration + ",JMSPriority = " + _priority + ",JMSTimestamp = " + _timestamp + ",JMSType = " + _type;
     }
 
+    private boolean useEncodedForm()
+    {
+        return _encodedForm != null && (_headers == null || _headers.isClean());
+    }
+
+
 }