Don't construct property builder unnecessarily

Wiebe Cazemier
1 parent 3022c275
Showing 3 changed files with 8 additions and 2 deletions
mqttpacket.cpp
types.cpp
types.h
@@ -133,8 +133,8 @@ MqttPacket::MqttPacket(const ProtocolVersion protocolVersion, const Publish &amp;_pu
     if (protocolVersion >= ProtocolVersion::Mqtt5)
     {
-        // Step 1: make certain properties available as objects, because FlashMQ needs access to them for internal logic.
-        if (_publish.propertyBuilder) // TODO: only do this when there are user properties. Otherwise we don't need it.
+        // Step 1: make certain properties available as objects, because FlashMQ needs access to them for internal logic (only ACL checking at this point).
+        if (_publish.hasUserProperties())
         {
             this->publishData.constructPropertyBuilder();
             this->publishData.propertyBuilder->setNewUserProperties(_publish.propertyBuilder->getUserProperties());
@@ -159,6 +159,11 @@ void PublishBase::constructPropertyBuilder()
     this->propertyBuilder = std::make_shared<Mqtt5PropertyBuilder>();
 }
+bool PublishBase::hasUserProperties() const
+{
+    return this->propertyBuilder.operator bool() && this->propertyBuilder->getUserProperties().operator bool();
+}
+
 Publish::Publish(const Publish &other) :
     PublishBase(other)
 {
@@ -215,6 +215,7 @@ public:
     size_t getLengthWithoutFixedHeader() const;
     void setClientSpecificProperties();
     void constructPropertyBuilder();
+    bool hasUserProperties() const;
 };
 class Publish : public PublishBase