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

[ma...@apache.org]

Author: mamta
Date: Mon Aug 30 16:08:20 2010
New Revision: 990841

URL: http://svn.apache.org/viewvc?rev=990841&view=rev
Log:
DERBY-3644 and DERBY-2109

As part of DERBY-2109, shutdown command started accepting optional user name and password. Bacause of this change in command, the protcol level was bumped up to 2. But this caused all the network server commands from clients with DERBY-2109 changes to break against a server without the DERBY-2109 changes. That is because the server checks the protocol level of the client commands and if they do match with server protocol version, then server will simply throw an exception about mistmatch of protocol levels and thus causing all the client commands from post DERBY-2109 clients to break against server with pre-DERBY-2109 changes.

Will create another jira to handle the shutdown command's optional user name and password parameters.


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=990841&r1=990840&r2=990841&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 Aug 30 16:08:20 2010
@@ -131,8 +131,7 @@ public final class NetworkServerControlI
 
 	// command protocol version - you need to increase this number each time
 	// the command protocol changes 
-    // DERBY-2109: shutdown command now transmits user credentials
-	private final static int PROTOCOL_VERSION = 2;
+	private final static int PROTOCOL_VERSION = 1;
 	private final static String COMMAND_HEADER = "CMD:";
 	private final static String REPLY_HEADER = "RPY:";
 	private final static int REPLY_HEADER_LENGTH = REPLY_HEADER.length();