MsgHandler must not be enqueued in InQueue on virtual redirect, fixes #…

…682
xrootd · Apr 6, 2018 · 9b16750 · 9b16750
1 parent 97ca085
commit 9b16750
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/src/XrdCl/XrdClMessageUtils.cc b/src/XrdCl/XrdClMessageUtils.cc
@@ -177,7 +177,7 @@ namespace XrdCl
     //--------------------------------------------------------------------------
     // Redirect the message
     //--------------------------------------------------------------------------
-    st = postMaster->Redirect( url, msg, msgHandler, msgHandler );
+    st = postMaster->Redirect( url, msg, msgHandler );
     if( !st.IsOK() )
     {
       XRootDTransport::UnMarshallRequest( msg );

diff --git a/src/XrdCl/XrdClPostMaster.cc b/src/XrdCl/XrdClPostMaster.cc
@@ -193,14 +193,12 @@ namespace XrdCl
 
   Status PostMaster::Redirect( const URL          &url,
                                Message            *msg,
-                               OutgoingMsgHandler *outHandler,
                                IncomingMsgHandler *inHandler )
   {
     RedirectorRegistry &registry  = RedirectorRegistry::Instance();
     VirtualRedirector *redirector = registry.Get( url );
     if( !redirector )
       return Status( stError, errInvalidOp );
-    outHandler->OnStatusReady( msg, Status() );
     return redirector->HandleRequest( msg, inHandler );
   }
 

diff --git a/src/XrdCl/XrdClPostMaster.hh b/src/XrdCl/XrdClPostMaster.hh
@@ -125,7 +125,6 @@ namespace XrdCl
       //------------------------------------------------------------------------
       Status Redirect( const URL          &url,
                        Message            *msg,
-                       OutgoingMsgHandler *outHandler,
                        IncomingMsgHandler *handler);
 
       //------------------------------------------------------------------------

diff --git a/src/XrdCl/XrdClXRootDMsgHandler.cc b/src/XrdCl/XrdClXRootDMsgHandler.cc
@@ -1962,7 +1962,7 @@ namespace XrdCl
     }
     pUrl = url;
     if( pUrl.IsMetalink() && pFollowMetalink )
-      return pPostMaster->Redirect( pUrl, pRequest, this, this );
+      return pPostMaster->Redirect( pUrl, pRequest, this );
     else if( pUrl.IsLocalFile() )
     {
       HandleLocalRedirect( &pUrl );