Merge branch 'nick/ssh/missing_catch/OTP-8908' into maint-r13

* nick/ssh/missing_catch/OTP-8908:
  The fix regarding OTP-8863 was not included in the previous version as stated

4 files changed, 24 insertions, 4 deletions

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index aedb682f79..9a08c72c93 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,22 @@
     <file>notes.xml</file>
   </header>
 
+ <section><title>Ssh 1.1.13</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The fix regarding OTP-8863 was not included in the previous
+            version as stated.</p>
+          <p>
+	    Own Id: OTP-8908</p>
+        </item>
+      </list>
+    </section>
+
+ </section>
+
  <section><title>Ssh 1.1.12</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 09249e5e39..160e336873 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,6 +19,7 @@
 
 {"%VSN%",	
  [
+  {"1.1.12", [{load_module, ssh_system_sup, soft_purge, soft_purge, []}]},
   {"1.1.11", [{restart_application, ssh}]},
   {"1.1.10", [{restart_application, ssh}]},
   {"1.1.9", [{restart_application, ssh}]},
@@ -31,6 +32,7 @@
   {"1.1.2", [{restart_application, ssh}]}
  ],
  [
+  {"1.1.12", [{load_module, ssh_system_sup, soft_purge, soft_purge, []}]},
   {"1.1.11", [{restart_application, ssh}]},
   {"1.1.10", [{restart_application, ssh}]},
   {"1.1.9", [{restart_application, ssh}]},
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index 0ff73f1648..d1003e12f2 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2010. 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
@@ -85,7 +85,7 @@ start_subsystem(SystemSup, Options) ->
     supervisor:start_child(SystemSup, Spec).
 
 stop_subsystem(SystemSup, SubSys) ->
-    case lists:keyfind(SubSys, 2, supervisor:which_children(SystemSup)) of
+    case catch lists:keyfind(SubSys, 2, supervisor:which_children(SystemSup)) of
 	false ->
 	    {error, not_found};
 	{Id, _, _, _} ->
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index cf90e3b11e..a6bc521003 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,9 +1,11 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 1.1.12
+SSH_VSN = 1.1.13
 APP_VSN    = "ssh-$(SSH_VSN)"
 
-TICKETS = OTP-8807 \
+TICKETS = OTP-8908
+
+TICKETS_1.1.12 = OTP-8807 \
 	OTP-8881
 
 TICKETS_1.1.11 = OTP-8735