You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by tm...@apache.org on 2006/02/19 15:37:57 UTC
svn commit: r378903 - in /db/derby/code/trunk/java:
drda/org/apache/derby/drda/NetworkServerControl.java
testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java
Author: tmnk
Date: Sun Feb 19 06:37:57 2006
New Revision: 378903
URL: http://svn.apache.org/viewcvs?rev=378903&view=rev
Log:
DERBY-273 The derbynet/dataSourcePermissions_net.java test fails intermittently - Patch by Tomohito Nakayama (tomonaka@basil.ocn.ne.jp)
Modified:
db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java
Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java?rev=378903&r1=378902&r2=378903&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java Sun Feb 19 06:37:57 2006
@@ -484,6 +484,15 @@
{
serverImpl.clientLocale = locale;
}
+
+
+ public void setLogWriter(PrintWriter logWriter){
+
+ serverImpl.setLogWriter( logWriter );
+
+ }
+
+
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java?rev=378903&r1=378902&r2=378903&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java Sun Feb 19 06:37:57 2006
@@ -120,10 +120,28 @@
// Shutdown the server.
if (hostName.equals("localhost"))
{
+
+ PrintWriter shutdownLogWriter = null;
+
+ try{
+
+ shutdownLogWriter =
+ new PrintWriter( new FileWriter( new File("shutdown.log") ) );
+ networkServer.setLogWriter(shutdownLogWriter);
+
networkServer.shutdown();
// how do we do this with the new api?
//networkServer.join();
Thread.sleep(5000);
+
+ }finally{
+
+ if( shutdownLogWriter != null ){
+ shutdownLogWriter.flush();
+ shutdownLogWriter.close();
+ }
+ }
+
}
System.out.println("Completed dataSourcePermissions_net");