svn commit: r766258 - /mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java

[gnodet]

Author: gnodet
Date: Sat Apr 18 07:26:10 2009
New Revision: 766258

URL: http://svn.apache.org/viewvc?rev=766258view=rev
Log:
SSHD-14: Fix 'channel_by_id: 1: bad id: channel free' client error

Modified:

mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java

Modified: 
mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
URL: 
http://svn.apache.org/viewvc/mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java?rev=766258r1=766257r2=766258view=diff
==
--- 
mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
 (original)
+++ 
mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
 Sat Apr 18 07:26:10 2009
@@ -146,7 +146,7 @@
 log.info(Received channel request: {}, type);
 if (!handleRequest(type, buffer)) {
 buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_FAILURE);
-buffer.putInt(id);
+buffer.putInt(recipient);
 session.writePacket(buffer);
 }
 }
@@ -227,7 +227,7 @@
 log.debug(env for channel {}: {} = {}, new Object[] { id, name, 
value });
 if (wantReply) {
 buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-buffer.putInt(id);
+buffer.putInt(recipient);
 session.writePacket(buffer);
 }
 return true;
@@ -266,7 +266,7 @@
 // TODO: handle pty request correctly
 if (wantReply) {
 buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-buffer.putInt(id);
+buffer.putInt(recipient);
 session.writePacket(buffer);
 }
 return true;
@@ -282,7 +282,7 @@
 // TODO: handle window-change request correctly
 if (wantReply) {
 buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-buffer.putInt(id);
+buffer.putInt(recipient);
 session.writePacket(buffer);
 }
 return true;
@@ -295,7 +295,7 @@
 // TODO: handle signal request correctly
 if (wantReply) {
 buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-buffer.putInt(id);
+buffer.putInt(recipient);
 session.writePacket(buffer);
 }
 return true;
@@ -335,7 +335,7 @@
 
 if (wantReply) {
 buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-buffer.putInt(id);
+buffer.putInt(recipient);
 session.writePacket(buffer);
 }
 
@@ -392,7 +392,7 @@
 
 if (wantReply) {
 buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-buffer.putInt(id);
+buffer.putInt(recipient);
 session.writePacket(buffer);
 }
 
@@ -407,7 +407,7 @@
 // TODO: start subsystem
 if (wantReply) {
 buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-buffer.putInt(id);
+buffer.putInt(recipient);
 session.writePacket(buffer);
 }
 return true;
@@ -418,7 +418,7 @@
 // TODO: start agent forwarding
 if (wantReply) {
 buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-buffer.putInt(id);
+buffer.putInt(recipient);
 session.writePacket(buffer);
 }
 return true;
@@ -429,7 +429,7 @@
 // TODO: start x11 forwarding
 if (wantReply) {
 buffer = 
session.createBuffer(SshConstants.Message.SSH_MSG_CHANNEL_SUCCESS);
-buffer.putInt(id);
+buffer.putInt(recipient);
 session.writePacket(buffer);
 }
 return true;

[continuum] BUILD FAILURE: MINA - Apache Mina SSHD - default maven2 buildDefinition

[contin...@vmbuild.apache.org]

Online report : 
http://vmbuild.apache.org/continuum/buildResult.action?buildId=188560projectId=1497

Build statistics:
 State: Failed
 Previous State: Ok
 Started at: Sat 18 Apr 2009 02:58:04 -0700
 Finished at: Sat 18 Apr 2009 03:14:27 -0700
 Total time: 16m 23s
 Build Trigger: Schedule
 Build Number: 13
 Exit code: 1
 Building machine hostname: vmbuild.apache.org
 Operating system : Linux(unknown)
 Java Home version : 
 java version 1.6.0_06

 Java(TM) SE Runtime Environment (build 1.6.0_06-b02)
 Java HotSpot(TM) Client VM (build 10.0-b22, mixed mode, sharing)
   
 Builder version :

 Maven version: 2.0.9
 Java version: 1.6.0_06
 OS name: linux version: 2.6.24-23-server arch: i386 Family: 
unix
   


SCM Changes:

Changed: gnodet @ Sat 18 Apr 2009 00:21:09 -0700
Comment: SSHD-20: Avoid race conditions when creating channels
Files changed:
 
/mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
 ( 766257 )

Changed: gnodet @ Sat 18 Apr 2009 00:26:10 -0700
Comment: SSHD-14: Fix 'channel_by_id: 1: bad id: channel free' client error
Files changed:
 
/mina/sshd/trunk/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
 ( 766258 )


Dependencies Changes:

No dependencies changed



Build Definition:

POM filename: pom.xml
Goals: clean install   
Arguments: --batch-mode --non-recursive

Build Fresh: false
Always Build: false
Default Build Definition: true
Schedule: DEFAULT_SCHEDULE
Description: default maven2 buildDefinition


Test Summary:

Tests: 35
Failures: 0
Total time: 943.956