Merge with 0.4

[prosody.git] / core / componentmanager.lua

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index 93e2ae7b1d64ec54c9db705fca3eb7bf13f3b92b..d76b78495ad092010e034d75002b6fb50bd3e62d 100644 (file)
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -80,8 +80,7 @@ end
 
 function create_component(host, component)
        -- TODO check for host well-formedness
-       local session = session or { type = "component", host = host, connected = true, s2sout = {} };
-       return session;
+       return { type = "component", host = host, connected = true, s2sout = {} };
 end
 
 function register_component(host, component, session)