db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1569125 - in /db/derby/code/branches/10.9: ./ java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Date Mon, 17 Feb 2014 22:32:06 GMT
Author: myrnavl
Date: Mon Feb 17 22:32:06 2014
New Revision: 1569125

URL: http://svn.apache.org/r1569125
Log:
DERBY-5610; ServerPropertiesTest prints .java.net.SocketException: Connection reset to console
but test passes
  backport of revision 1526486 from trunk.

Modified:
    db/derby/code/branches/10.9/   (props changed)
    db/derby/code/branches/10.9/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java

Propchange: db/derby/code/branches/10.9/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1526172
  Merged /db/derby/code/branches/10.10:r1526486

Modified: db/derby/code/branches/10.9/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1569125&r1=1569124&r2=1569125&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
(original)
+++ db/derby/code/branches/10.9/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Mon Feb 17 22:32:06 2014
@@ -585,7 +585,9 @@ public final class NetworkServerControlI
 				e.printStackTrace(lw);
 			}
 		}
-		else
+		// DERBY-5610 - If there is no log writer, only print
+		// exception to System.out if derby.drda.debug=true
+		else if (debugOutput)
 		{
 			e.printStackTrace();
 		}



Mime
View raw message