db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1526486 - in /db/derby/code/branches/10.10: ./ java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Date Thu, 26 Sep 2013 13:47:07 GMT
Author: kmarsden
Date: Thu Sep 26 13:47:06 2013
New Revision: 1526486

URL: http://svn.apache.org/r1526486
Log:
DERBY-6349 - DaylightSavingTest - java.security.AccessControlException
merge revision 1525671 from trunk


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

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

Modified: db/derby/code/branches/10.10/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1526486&r1=1526485&r2=1526486&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
(original)
+++ db/derby/code/branches/10.10/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Thu Sep 26 13:47:06 2013
@@ -578,7 +578,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