[Red5devs] [PATCH 14 of 15] connection object erroneously called "client"

[mabrek]

diff -r 5a36e8d099f4 -r 3e241327cb9a src/org/red5/server/net/rtmpt/RTMPTServlet.java
--- a/src/org/red5/server/net/rtmpt/RTMPTServlet.java	Tue Aug 05 16:24:47 2008 +0400
+++ b/src/org/red5/server/net/rtmpt/RTMPTServlet.java	Mon Jul 21 11:37:55 2008 +0400
@@ -221,7 +221,7 @@
 	 *            Servlet request
 	 * @return RTMP client connection
 	 */
-	protected RTMPTConnection getClient(HttpServletRequest req) {
+	protected RTMPTConnection getClientConnection(HttpServletRequest req) {
 		final Integer id = getClientId(req);
 		return getConnection(id);
 	}
@@ -318,18 +318,18 @@
 		// Skip sent data
 		skipData(req);
 
-		RTMPTConnection client = getClient(req);
-		if (client == null) {
+		RTMPTConnection connection = getClientConnection(req);
+		if (connection == null) {
 			handleBadRequest("Unknown client.", resp);
 			return;
 		}
-		removeConnection(client.getId());
+		removeConnection(connection.getId());
 
-		client.setServletRequest(req);
-		handler.connectionClosed(client, client.getState());
+		connection.setServletRequest(req);
+		handler.connectionClosed(connection, connection.getState());
 
 		returnMessage((byte) 0, resp);
-		client.realClose();
+		connection.realClose();
 	}
 
 	/**
@@ -347,17 +347,17 @@
 	protected void handleSend(HttpServletRequest req, HttpServletResponse resp)
 			throws ServletException, IOException {
 
-		RTMPTConnection client = getClient(req);
-		if (client == null) {
+		RTMPTConnection connection = getClientConnection(req);
+		if (connection == null) {
 			handleBadRequest("Unknown client.", resp);
 			return;
-		} else if (client.getState().getState() == RTMP.STATE_DISCONNECTED) {
-			removeConnection(client.getId());
+		} else if (connection.getState().getState() == RTMP.STATE_DISCONNECTED) {
+			removeConnection(connection.getId());
 			handleBadRequest("Connection already closed.", resp);
 			return;
 		}
 
-		client.setServletRequest(req);
+		connection.setServletRequest(req);
 
 		// Put the received data in a ByteBuffer
 		int length = req.getContentLength();
@@ -366,25 +366,25 @@
 		data.flip();
 
 		// Decode the objects in the data
-		List messages = client.decode(data);
+		List messages = connection.decode(data);
 		data.release();
 		data = null;
 		if (messages == null || messages.isEmpty()) {
-			returnMessage(client.getPollingDelay(), resp);
+			returnMessage(connection.getPollingDelay(), resp);
 			return;
 		}
 
 		// Execute the received RTMP messages
 		for (Object message : messages) {
 			try {
-				handler.messageReceived(client, client.getState(), message);
+				handler.messageReceived(connection, connection.getState(), message);
 			} catch (Exception e) {
 				log.error("Could not process message.", e);
 			}
 		}
 
 		// Send results to client
-		returnPendingMessages(client, resp);
+		returnPendingMessages(connection, resp);
 	}
 
 	/**
@@ -405,23 +405,23 @@
 		// Skip sent data
 		skipData(req);
 
-		RTMPTConnection client = getClient(req);
-		if (client == null) {
+		RTMPTConnection connection = getClientConnection(req);
+		if (connection == null) {
 			handleBadRequest("Unknown client.", resp);
 			return;
-		} else if (client.isClosing()) {
+		} else if (connection.isClosing()) {
 			// Tell client to close the connection
 			returnMessage((byte) 0, resp);
-			client.realClose();
+			connection.realClose();
 			return;
-		} else if (client.getState().getState() == RTMP.STATE_DISCONNECTED) {
-			removeConnection(client.getId());
+		} else if (connection.getState().getState() == RTMP.STATE_DISCONNECTED) {
+			removeConnection(connection.getId());
 			handleBadRequest("Connection already closed.", resp);
 			return;
 		}
 
-		client.setServletRequest(req);
-		returnPendingMessages(client, resp);
+		connection.setServletRequest(req);
+		returnPendingMessages(connection, resp);
 	}
 
 	/**