svn commit: r999078 - /db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java

[ma...@apache.org]

Author: mamta
Date: Mon Sep 20 19:28:49 2010
New Revision: 999078

URL: http://svn.apache.org/viewvc?rev=999078&view=rev
Log:
Reverting change 990841 from trunk which had gone for DERBY-3644 (NetworkServerControl.ping() on trunk against 10.3.2.1 and older servers give 'DRDA_InvalidReplyHeader2.S:Invalid reply header from network server: Invalid string . Plaintext connection attempt to an SSL enabled server?'). The change is incomplete and will cause problems if it ever got backported by itself. I will checkin a complete fix soon which will address DERBY-3644 and DERBY-4786



Modified:
    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/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=999078&r1=999077&r2=999078&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 Mon Sep 20 19:28:49 2010
@@ -131,7 +131,8 @@ public final class NetworkServerControlI
 
 	// command protocol version - you need to increase this number each time
 	// the command protocol changes 
-	private final static int PROTOCOL_VERSION = 1;
+    // DERBY-2109: shutdown command now transmits user credentials
+	private final static int PROTOCOL_VERSION = 2;
 	private final static String COMMAND_HEADER = "CMD:";
 	private final static String REPLY_HEADER = "RPY:";
 	private final static int REPLY_HEADER_LENGTH = REPLY_HEADER.length();