replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / resource / include / ResourceInitException.h

diff --git a/resource/include/ResourceInitException.h b/resource/include/ResourceInitException.h
index 9794e42..6767a44 100644 (file)
--- a/resource/include/ResourceInitException.h
+++ b/resource/include/ResourceInitException.h
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef _RESOURCE_INIT_EXCEPTION_H_
-#define _RESOURCE_INIT_EXCEPTION_H_
+#ifndef OC_RESOURCE_INIT_EXCEPTION_H_
+#define OC_RESOURCE_INIT_EXCEPTION_H_
 
 #include <stdexcept>
 #include "StringConstants.h"
@@ -31,17 +31,21 @@ namespace OC
     public:
         ResourceInitException(
                 bool missingUri,
+                bool invalidUri,
                 bool missingType,
                 bool missingInterface,
                 bool missingClientWrapper,
                 bool invalidPort,
-                bool invalidIp)
+                bool invalidIp,
+                bool invalidHost)
         : m_missingUri(missingUri),
+          m_invalidUri(invalidUri),
           m_missingType(missingType),
           m_missingInterface(missingInterface),
           m_missingClientWrapper(missingClientWrapper),
           m_invalidPort(invalidPort),
-          m_invalidIp(invalidIp)
+          m_invalidIp(invalidIp),
+          m_invalidHost(invalidHost)
         {
         }
 
@@ -55,6 +59,11 @@ namespace OC
             return m_invalidIp;
         }
 
+        bool isInvalidHost() const
+        {
+            return m_invalidHost;
+        }
+
         bool isClientWrapperMissing() const
         {
             return m_missingClientWrapper;
@@ -65,6 +74,11 @@ namespace OC
             return m_missingUri;
         }
 
+        bool isInvalidUri() const
+        {
+            return m_invalidUri;
+        }
+
         bool isTypeMissing() const
         {
             return m_missingType;
@@ -75,7 +89,7 @@ namespace OC
             return m_missingInterface;
         }
 
-        virtual const char* what() const noexcept
+        virtual const char* what() const BOOST_NOEXCEPT
         {
             std::string ret;
 
@@ -83,6 +97,10 @@ namespace OC
             {
                 ret += OC::InitException::MISSING_URI;
             }
+            else if(isInvalidUri())
+            {
+                ret += OC::InitException::INVALID_URI;
+            }
 
             if(isTypeMissing())
             {
@@ -109,17 +127,24 @@ namespace OC
                 ret += OC::InitException::INVALID_IP;
             }
 
+            if(isInvalidHost())
+            {
+                ret += OC::InitException::INVALID_HOST;
+            }
+
             return ret.c_str();
         }
 
     private:
 
         bool m_missingUri;
+        bool m_invalidUri;
         bool m_missingType;
         bool m_missingInterface;
         bool m_missingClientWrapper;
         bool m_invalidPort;
         bool m_invalidIp;
+        bool m_invalidHost;
     };
 }