1.1 --- a/core/smn_protobuf.cpp	Fri Mar 29 12:28:02 2013 -0400
     1.2 +++ b/core/smn_protobuf.cpp	Fri Mar 29 11:37:29 2013 -0700
     1.3 @@ -47,7 +47,7 @@
     1.4  	sec.pOwner = NULL;                                \
     1.5  	sec.pIdentity = g_pCoreIdent;                     \
     1.6  	                                                  \
     1.7 -	if ((herr=g_HandleSys.ReadHandle(hndl, g_ProtobufType, &sec, (void **)&msg)) \
     1.8 +	if ((herr=handlesys->ReadHandle(hndl, g_ProtobufType, &sec, (void **)&msg)) \
     1.9  		!= HandleError_None)                          \
    1.10  	{                                                 \
    1.11  		return pCtx->ThrowNativeError("Invalid protobuf message handle %x (error %d)", hndl, herr); \
    1.12 @@ -872,7 +872,7 @@
    1.13  		return pCtx->ThrowNativeError("Invalid field \"%s\" for message \"%s\"", strField, msg->GetProtobufMessage()->GetTypeName().c_str());
    1.14  	}
    1.15  
    1.16 -	Handle_t outHndl = g_HandleSys.CreateHandle(g_ProtobufType, new SMProtobufMessage(innerMsg), NULL, g_pCoreIdent, NULL);
    1.17 +	Handle_t outHndl = handlesys->CreateHandle(g_ProtobufType, new SMProtobufMessage(innerMsg), NULL, g_pCoreIdent, NULL);
    1.18  	msg->AddChildHandle(outHndl);
    1.19  
    1.20  	return outHndl;
    1.21 @@ -889,7 +889,7 @@
    1.22  		return pCtx->ThrowNativeError("Invalid field \"%s\"[%d] for message \"%s\"", strField, params[3], msg->GetProtobufMessage()->GetTypeName().c_str());
    1.23  	}
    1.24  
    1.25 -	Handle_t outHndl = g_HandleSys.CreateHandle(g_ProtobufType, new SMProtobufMessage(const_cast<protobuf::Message *>(innerMsg)), NULL, g_pCoreIdent, NULL);
    1.26 +	Handle_t outHndl = handlesys->CreateHandle(g_ProtobufType, new SMProtobufMessage(const_cast<protobuf::Message *>(innerMsg)), NULL, g_pCoreIdent, NULL);
    1.27  	msg->AddChildHandle(outHndl);
    1.28  
    1.29  	return outHndl;
    1.30 @@ -906,7 +906,7 @@
    1.31  		return pCtx->ThrowNativeError("Invalid field \"%s\" for message \"%s\"", strField, msg->GetProtobufMessage()->GetTypeName().c_str());
    1.32  	}
    1.33  
    1.34 -	Handle_t outHndl = g_HandleSys.CreateHandle(g_ProtobufType, new SMProtobufMessage(innerMsg), NULL, g_pCoreIdent, NULL);
    1.35 +	Handle_t outHndl = handlesys->CreateHandle(g_ProtobufType, new SMProtobufMessage(innerMsg), NULL, g_pCoreIdent, NULL);
    1.36  	msg->AddChildHandle(outHndl);
    1.37  
    1.38  	return outHndl;