diff options
| author | Lars Thorsen <[email protected]> | 2015-04-24 09:51:50 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2015-05-08 12:32:15 +0200 |
| commit | 1e115b3e972bb8c23504ee75ad8fb2e202a6758a (patch) | |
| tree | bd4fd42371c80e747220ab25fc01cd09dc59b41d /lib/cosProperty/src | |
| parent | 2e90dc9905de1e2817377fc2cfbd712ad8c802d0 (diff) | |
| download | otp-1e115b3e972bb8c23504ee75ad8fb2e202a6758a.tar.gz otp-1e115b3e972bb8c23504ee75ad8fb2e202a6758a.tar.bz2 otp-1e115b3e972bb8c23504ee75ad8fb2e202a6758a.zip | |
[orber, cos*] Remove usage of erlang:now()
Diffstat (limited to 'lib/cosProperty/src')
| -rw-r--r-- | lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl | 6 | ||||
| -rw-r--r-- | lib/cosProperty/src/cosProperty.erl | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl index 157b243c53..788518c7bb 100644 --- a/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl +++ b/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2009. All Rights Reserved. +%% Copyright Ericsson AB 2000-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -128,7 +128,9 @@ %% {stop, Reason} %%---------------------------------------------------------------------- init({DefMode, AllowedTypes, AllowedProperties, InitProperties, MyType}) -> - Key = term_to_binary({now(), node()}), + Key = term_to_binary({{erlang:system_time(), + erlang:unique_integer()}, + node()}), _F = ?write_function(#oe_CosPropertyService{key=Key, properties=InitProperties}), write_result(mnesia:transaction(_F)), diff --git a/lib/cosProperty/src/cosProperty.erl b/lib/cosProperty/src/cosProperty.erl index 2368ee3db6..57c35dedf9 100644 --- a/lib/cosProperty/src/cosProperty.erl +++ b/lib/cosProperty/src/cosProperty.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2009. All Rights Reserved. +%% Copyright Ericsson AB 2000-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -406,8 +406,9 @@ type_check(Obj, Mod) -> %% Effect : %%------------------------------------------------------------ create_name(Type) -> - {MSec, Sec, USec} = erlang:now(), - lists:concat(['oe_',node(),'_',Type,'_',MSec, '_', Sec, '_', USec]). + Time = erlang:system_time(), + Unique = erlang:unique_integer([positive]), + lists:concat(['oe_',node(),'_',Type,'_',Time,'_',Unique]). %%--------------- END OF MODULE ------------------------------ |