svn commit: r398382 - /db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/ClientThread.java

[bp...@apache.org]

Author: bpendleton
Date: Sun Apr 30 10:03:21 2006
New Revision: 398382

URL: http://svn.apache.org/viewcvs?rev=398382&view=rev
Log:
DERBY-395: Server-side trace-on and trace-off commands not working properly

This change merges the fix for DERBY-395 from the trunk to the 10.1 branch.


Modified:
    db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/ClientThread.java

Modified: db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/ClientThread.java
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/ClientThread.java?rev=398382&r1=398381&r2=398382&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/ClientThread.java (original)
+++ db/derby/code/branches/10.1/java/drda/org/apache/derby/impl/drda/ClientThread.java Sun Apr 30 10:03:21 2006
@@ -30,8 +30,6 @@
 	ServerSocket serverSocket;
 	private int timeSlice;
 	private int connNum;
-	private String traceDir;
-	private boolean traceAll;
 
 		ClientThread (NetworkServerControlImpl nsi, ServerSocket ss) {
 
@@ -42,8 +40,6 @@
 			parent=nsi;
 			serverSocket=ss;
 			timeSlice=nsi.getTimeSlice();
-			traceDir=parent.getTraceDirectory();
-			traceAll=parent.getTraceAll();
 		}
 			
 		public void run() 
@@ -86,8 +82,14 @@
 							Integer.toString(connNum));
 
 				//create a new Session for this session
+				// Note that we always re-fetch the tracing
+				// configuration from the parent, because it
+				// may have changed (there are administrative
+				// commands which allow dynamic tracing
+				// reconfiguration).
 				clientSession = new Session(connNum, clientSocket, 
-					traceDir, traceAll);
+					parent.getTraceDirectory(),
+					parent.getTraceAll());
 
 				//add to Session list
 				parent.addToSessionTable(new Integer(connNum), clientSession);