fix private objects management

diff --git a/src/MediaServer/JSMediaServer.cpp b/src/MediaServer/JSMediaServer.cpp
index 1afcc48..768e772 100644 (file)
--- a/src/MediaServer/JSMediaServer.cpp
+++ b/src/MediaServer/JSMediaServer.cpp
@@ -166,7 +166,7 @@ JSValueRef JSMediaServer::browse(JSContextRef context,
 {
        LoggerD("Entered JSMediaServer::browse");
        // TODO try/catch block
-               MediaServerPrivObject* privateObject = static_cast<MediaServerPrivObject*>(JSObjectGetPrivate(object));
+               MediaServerPrivObject* privateObject = static_cast<MediaServerPrivObject*>(JSObjectGetPrivate(thisObject));
                if (NULL == privateObject)
                {
                        LoggerE("private object is null");
@@ -211,7 +211,7 @@ JSValueRef JSMediaServer::find(JSContextRef context,
 {
        LoggerD("Entered JSMediaServer::find");
        // TODO try/catch block
-               MediaServerPrivObject* privateObject = static_cast<MediaServerPrivObject*>(JSObjectGetPrivate(object));
+               MediaServerPrivObject* privateObject = static_cast<MediaServerPrivObject*>(JSObjectGetPrivate(thisObject));
                if (NULL == privateObject)
                {
                        LoggerE("private object is null");

diff --git a/src/MediaServer/JSMediaServerManager.cpp b/src/MediaServer/JSMediaServerManager.cpp
index 80f7818..b34d8fd 100644 (file)
--- a/src/MediaServer/JSMediaServerManager.cpp
+++ b/src/MediaServer/JSMediaServerManager.cpp
@@ -107,13 +107,11 @@ JSValueRef JSMediaServerManager::scanNetwork(JSContextRef context,
        LoggerD("Entered JSMediaServerManager::scanNetwork");
 
        // TODO try/catch block
-               MediaServerManagerPrivObject* privateObject = static_cast<MediaServerManagerPrivObject*>(JSObjectGetPrivate(object));
+               MediaServerManagerPrivObject* privateObject = static_cast<MediaServerManagerPrivObject*>(JSObjectGetPrivate(thisObject));
                if (NULL == privateObject)
                {
                        LoggerE("private object is null");
-                       // FIXME re-doing intialization ? several instances ?
-                       MediaServerManagerPtr mediaservermanager(new MediaServerManager());
-                       privateObject = new MediaServerManagerPrivObject( context, mediaservermanager);
+                       // TODO post exception
                }
 
        // TODO use event handlers instead of callbacks