You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/11/29 10:35:23 UTC

svn commit: r1771878 - /qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java

Author: kwall
Date: Tue Nov 29 10:35:23 2016
New Revision: 1771878

URL: http://svn.apache.org/viewvc?rev=1771878&view=rev
Log:
QPID-7546 : Prevent messages without without propertt or header section(s) failing with a NPE within MessageMetaData_1_0.MessageHeader_1_0#getExpiration

Fixes failing Python test qpid_tests.broker_1_0.selector.SelectorTests

Modified:
    qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java

Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java?rev=1771878&r1=1771877&r2=1771878&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java Tue Nov 29 10:35:23 2016
@@ -23,6 +23,7 @@ package org.apache.qpid.server.protocol.
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -38,6 +39,7 @@ import org.apache.qpid.server.protocol.v
 import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
 import org.apache.qpid.server.protocol.v1_0.type.Section;
 import org.apache.qpid.server.protocol.v1_0.type.Symbol;
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
 import org.apache.qpid.server.protocol.v1_0.type.codec.AMQPDescribedTypeRegistry;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.AmqpSequence;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.AmqpValue;
@@ -450,15 +452,19 @@ public class MessageMetaData_1_0 impleme
             }
         }
 
+        @Override
         public long getExpiration()
         {
-            if(_properties.getAbsoluteExpiryTime() != null)
+            final Date absoluteExpiryTime = _properties == null ? null : _properties.getAbsoluteExpiryTime();
+            if(absoluteExpiryTime != null)
             {
-                return _properties.getAbsoluteExpiryTime().getTime();
+                return absoluteExpiryTime.getTime();
             }
             else
             {
-                return _header.getTtl() == null || _properties.getCreationTime() == null ? 0L : _header.getTtl().longValue() + _properties.getCreationTime().getTime();
+                final Date creationTime = _properties == null ? null : _properties.getCreationTime();
+                final UnsignedInteger ttl = _header == null ? null : _header.getTtl();
+                return ttl == null || creationTime == null ? 0L : ttl.longValue() + creationTime.getTime();
             }
         }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org