Revert "Fix SVACE issue"

This reverts commit 23495f040e131cec575a6a2e9333ee6df270f973.

Change-Id: Iefbfa5f59a526f5ad785795839cc155d0b13c876

diff --git a/dali/public-api/object/any.h b/dali/public-api/object/any.h
index 0dbf325..b093822 100644 (file)
--- a/dali/public-api/object/any.h
+++ b/dali/public-api/object/any.h
@@ -183,9 +183,8 @@ public:
     else if( mContainer->GetType() != typeid( Type ) ) // Check if the value has the same value than the Any type.
     {
       AssertAlways( "Any::Get(). Trying to retrieve a value of a different type than the template one." );
-      return static_cast< AnyContainerImpl< Type >* >( mContainer )->GetValue();
     }
-    return NULL;
+    return static_cast< AnyContainerImpl< Type >* >( mContainer )->GetValue();
   }
 
   /**