db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r640828 - in /db/derby/code/trunk/java/drda/org/apache/derby/impl/drda: ClientThread.java NetworkServerControlImpl.java
Date Tue, 25 Mar 2008 14:20:42 GMT
Author: rhillegas
Date: Tue Mar 25 07:20:37 2008
New Revision: 640828

URL: http://svn.apache.org/viewvc?rev=640828&view=rev
Log:
DERBY-3537: Commit Martin's patch which shuts down the server on SSL errors even without credentials.

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java?rev=640828&r1=640827&r2=640828&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java Tue Mar 25
07:20:37 2008
@@ -102,8 +102,8 @@
                     // ... we need to do a controlled shutdown of the
                     // server, since SSL for some reason will not
                     // work.
-                    
-                    parent.directShutdown();
+                    // DERBY-3537: circumvent any shutdown security checks
+                    parent.directShutdownInternal();
                     
                     return; // Exit the thread
                     

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=640828&r1=640827&r2=640828&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
(original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Tue Mar 25 07:20:37 2008
@@ -1105,7 +1105,7 @@
 	 Shutdown the server directly (If you have the original object)
 	 No Network communication needed.
 	*/
-	private void directShutdownInternal() {
+    void directShutdownInternal() {
 		// DERBY-2109: the direct, unchecked shutdown is made private
 		shutdown = true;
 		synchronized(shutdownSync) {						



Mime
View raw message