[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server ConnectionEstablisher.java

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server
In directory dev1:/tmp/cvs-serv6664/src/org/eclipse/dstore/core/server

Modified Files:
	ConnectionEstablisher.java 
Log Message:
[368072] [dstore][ssl] no exception logged upon bind error


Index: ConnectionEstablisher.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ConnectionEstablisher.java	25 Feb 2011 16:37:07 -0000	1.17
--- ConnectionEstablisher.java	9 Jan 2012 17:28:43 -0000	1.18
***************
*** 27,30 ****
--- 27,31 ----
   * 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
   *******************************************************************************/
  
***************
*** 353,356 ****
--- 354,363 ----
  							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)
  						{
***************
*** 359,363 ****
  					else
  					{
! 						serverSocket = new ServerSocket(i, backlog, bindAddr);
  					}
  				}
--- 366,382 ----
  					else
  					{
! 						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)
! 						{
! 						}
  					}
  				}
***************
*** 391,394 ****
--- 410,414 ----
  					_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)
***************
*** 406,409 ****
--- 426,430 ----
  					_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)