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/20 12:20:10 UTC
svn commit: r379091 - 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: Mon Feb 20 03:20:02 2006
New Revision: 379091
URL: http://svn.apache.org/viewcvs?rev=379091&view=rev
Log:
- rollback DERBY-273.patch - 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=379091&r1=379090&r2=379091&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 Mon Feb 20 03:20:02 2006
@@ -484,15 +484,6 @@
{
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=379091&r1=379090&r2=379091&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 Mon Feb 20 03:20:02 2006
@@ -120,28 +120,10 @@
// 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");