From 2872d7470531639b7a904488193b2b95b16f1241 Mon Sep 17 00:00:00 2001
From: Andrew Hanushevsky <abh@stanford.edu>
Date: Thu, 26 Jun 2014 04:53:55 -0700
Subject: [PATCH] Fix handling of the stream ID for truncate requests.

---
 src/XrdSsi/XrdSsiFile.cc           | 6 ++++--
 src/XrdSsi/XrdSsiFileReq.cc        | 2 +-
 src/XrdXrootd/XrdXrootdProtocol.cc | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/XrdSsi/XrdSsiFile.cc b/src/XrdSsi/XrdSsiFile.cc
index 29723154815..e591a080cb8 100644
--- a/src/XrdSsi/XrdSsiFile.cc
+++ b/src/XrdSsi/XrdSsiFile.cc
@@ -615,10 +615,12 @@ int XrdSsiFile::truncate(XrdSfsFileOffset  flen)  // In
          {case XrdSsiRRInfo::Rwt:
                respCB = error.getErrCB(respCBarg);
                if (rqstP->WantResponse(respCB, respCBarg))
-                  {DEBUG(reqID <<':' <<gigID <<" resp ready");
+                  {DEBUG(reqID <<':' <<gigID <<" resp ready "
+                               <<hex <<respCBarg <<dec);
                    return SFS_OK;
                   }
-               DEBUG(reqID <<':' <<gigID <<" resp not ready");
+               DEBUG(reqID <<':' <<gigID <<" resp not ready "
+                           <<hex <<respCBarg <<dec);
                error.setErrCB((XrdOucEICB *)rqstP);
                return SFS_STARTED;
                break;
diff --git a/src/XrdSsi/XrdSsiFileReq.cc b/src/XrdSsi/XrdSsiFileReq.cc
index 12b26a8753a..711f75fae43 100644
--- a/src/XrdSsi/XrdSsiFileReq.cc
+++ b/src/XrdSsi/XrdSsiFileReq.cc
@@ -783,7 +783,7 @@ void XrdSsiFileReq::WakeUp() // Called with myMutex locked!
 
 // Do some debugging
 //
-   DEBUGXQ("");
+   DEBUGXQ("respCBarg=" <<hex <<respCBarg <<dec);
 
 // Tell the client to issue a read now. We don't need a callback on this so
 // the callback handler will delete the errinfo object for us.
diff --git a/src/XrdXrootd/XrdXrootdProtocol.cc b/src/XrdXrootd/XrdXrootdProtocol.cc
index 3c8d46a70e4..3d9a5ff415b 100644
--- a/src/XrdXrootd/XrdXrootdProtocol.cc
+++ b/src/XrdXrootd/XrdXrootdProtocol.cc
@@ -412,7 +412,8 @@ int XrdXrootdProtocol::Process2()
           case kXR_sync:     ReqID.setID(Request.header.streamid);
                              return do_Sync();
           case kXR_close:    return do_Close();
-          case kXR_truncate: if (!Request.header.dlen) return do_Truncate();
+          case kXR_truncate: ReqID.setID(Request.header.streamid);
+                             if (!Request.header.dlen) return do_Truncate();
                              break;
           case kXR_query:    if (!Request.header.dlen) return do_Qfh();
           default:           break;