diff options
| author | Siri Hansen <[email protected]> | 2011-11-30 11:37:56 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-11-30 11:37:56 +0100 |
| commit | 81f08713ff0ea3e49c2432e489a74f49ab6ebc42 (patch) | |
| tree | 7d69a9ec25fbab8a63741cc59f663b7b1c025280 /lib/stdlib/doc | |
| parent | 8800c07a30b60ef450e2bac6dd920cccda7483ad (diff) | |
| parent | 3781b5129a3e43c1c2e5e33d1223e1e17a617be7 (diff) | |
| download | otp-81f08713ff0ea3e49c2432e489a74f49ab6ebc42.tar.gz otp-81f08713ff0ea3e49c2432e489a74f49ab6ebc42.tar.bz2 otp-81f08713ff0ea3e49c2432e489a74f49ab6ebc42.zip | |
Merge branch 'siri/stdlib/dialyzer-supervisor/OTP-9741'
* siri/stdlib/dialyzer-supervisor/OTP-9741:
Add test for upgrade of supervisor
Fix dialyzer warnings in supervisor
Diffstat (limited to 'lib/stdlib/doc')
| -rw-r--r-- | lib/stdlib/doc/src/gen_server.xml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml index 1045766e01..edeb7dff91 100644 --- a/lib/stdlib/doc/src/gen_server.xml +++ b/lib/stdlib/doc/src/gen_server.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>1996</year><year>2010</year> + <year>1996</year><year>2011</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -570,13 +570,14 @@ gen_server:abcast -----> Module:handle_cast/2 </desc> </func> <func> - <name>Module:code_change(OldVsn, State, Extra) -> {ok, NewState}</name> + <name>Module:code_change(OldVsn, State, Extra) -> {ok, NewState} | {error, Reason}</name> <fsummary>Update the internal state during upgrade/downgrade.</fsummary> <type> <v>OldVsn = Vsn | {down, Vsn}</v> <v> Vsn = term()</v> <v>State = NewState = term()</v> <v>Extra = term()</v> + <v>Reason = term()</v> </type> <desc> <p>This function is called by a gen_server when it should @@ -595,7 +596,10 @@ gen_server:abcast -----> Module:handle_cast/2 <p><c>State</c> is the internal state of the gen_server.</p> <p><c>Extra</c> is passed as-is from the <c>{advanced,Extra}</c> part of the update instruction.</p> - <p>The function should return the updated internal state.</p> + <p>If successful, the function shall return the updated + internal state.</p> + <p>If the function returns <c>{error,Reason}</c>, the ongoing + upgrade will fail and roll back to the old release.</p> </desc> </func> <func> |