From 49423f4665d68c8d32126f48c8ba0bbb264f21e2 Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Mon, 9 Jan 2012 17:28:43 +0000
Subject: [PATCH] [368072] [dstore][ssl] no exception logged upon bind error

---
 .../core/server/ConnectionEstablisher.java    | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java
index ed9e98ecb1a..279b3816771 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java
@@ -26,6 +26,7 @@
  * Noriaki Takatsu  (IBM) - [283656] [dstore][multithread] Serviceability issue
  * Noriaki Takatsu  (IBM) - [289678][api][breaking] ServerSocket creation in multiple IP addresses
  * David McKnight   (IBM) - [283613] [dstore] Create a Constants File for all System Properties we support
+ * David McKnight   (IBM) - [368072] [dstore][ssl] no exception logged upon bind error
  *******************************************************************************/
 
 package org.eclipse.dstore.core.server;
@@ -352,13 +353,31 @@ public class ConnectionEstablisher
 						{
 							serverSocket = sslContext.getServerSocketFactory().createServerSocket(i, backlog, bindAddr);
 						}
+						catch (BindException e)
+						{
+							_msg = ServerReturnCodes.RC_BIND_ERROR  + " on port " + port + ": " + e.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
+							System.err.println(_msg);
+							_dataStore.trace(_msg);
+						}
 						catch (Exception e)
 						{
 						}
 					}
 					else
 					{
-						serverSocket = new ServerSocket(i, backlog, bindAddr);
+						try
+						{
+							serverSocket = new ServerSocket(i, backlog, bindAddr);
+						}						
+						catch (BindException e)
+						{
+							_msg = ServerReturnCodes.RC_BIND_ERROR  + " on port " + port + ": " + e.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
+							System.err.println(_msg);
+							_dataStore.trace(_msg);
+						}
+						catch (Exception e)
+						{
+						}
 					}
 				}
 				catch (Exception e)
@@ -390,6 +409,7 @@ public class ConnectionEstablisher
 				catch (BindException e){
 					_msg = ServerReturnCodes.RC_BIND_ERROR  + " on port " + port + ": " + e.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
 					System.err.println(_msg);
+					_dataStore.trace(_msg);
 				}
 				catch (Exception e)
 				{
@@ -405,6 +425,7 @@ public class ConnectionEstablisher
 				catch (BindException e){
 					_msg = ServerReturnCodes.RC_BIND_ERROR  + " on port " + port + ": " + e.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
 					System.err.println(_msg);
+					_dataStore.trace(_msg);
 				}
 				catch (Exception e)
 				{