Changeset 14665 for trunk

Timestamp:

11/20/12 10:25:03 (12 years ago)

Author:

tbretz

Message:

Return undefined when a state is requested for a server which is not connected; added server property to state.

File:

• trunk/FACT++/src/InterpreterV8.cc (modified) (2 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -306 +306 @@
     const State rc = JsState(*str);
     if (rc.index<=-256)
-        return Object::New();
+        return Undefined();
 
     HandleScope handle_scope;
 
-    Handle<ObjectTemplate> obj = ObjectTemplate::New();
-    obj->Set(String::New("index"), Integer::New(rc.index),       ReadOnly);
-    obj->Set(String::New("name"),  String::New(rc.name.c_str()), ReadOnly);
+    Handle<Object> obj = Object::New();
+
+    obj->Set(String::New("server"), String::New(*str),            ReadOnly);
+    obj->Set(String::New("index"),  Integer::New(rc.index),       ReadOnly);
+    obj->Set(String::New("name"),   String::New(rc.name.c_str()), ReadOnly);
 
     const Local<Value> date = Date::New(rc.time.JavaDate());
@@ -318 +320 @@
         obj->Set(String::New("time"),  date);
 
-    return handle_scope.Close(obj->NewInstance());
+    return handle_scope.Close(obj);
 }