[XrdEc] Don't close ZipArchive obj that were not opened.

xrootd · Jan 20, 2021 · b9f6397 · b9f6397
1 parent 36f527b
commit b9f6397
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 16 deletions.
diff --git a/src/XrdEc/XrdEcReader.cc b/src/XrdEc/XrdEcReader.cc
@@ -531,9 +531,9 @@ namespace XrdEc
     auto itr = dataarchs.begin();
     for( ; itr != dataarchs.end() ; ++itr )
     {
-      XrdCl::ZipArchive &zip = *itr->second;
-      if( zip.IsOpen() )
-        closes.emplace_back( XrdCl::CloseArchive( zip ) );
+      auto &zipptr = itr->second;
+      if( zipptr->IsOpen() )
+        closes.emplace_back( XrdCl::CloseArchive( *zipptr ) >> [zipptr]( XrdCl::XRootDStatus& ){ } );
     }
 
     // if there is nothing to close just schedule the handler

diff --git a/src/XrdEc/XrdEcStrmWriter.cc b/src/XrdEc/XrdEcStrmWriter.cc
@@ -1,9 +1,26 @@
-/*
- * XrdEcStrmWriter.cc
- *
- *  Created on: 5 May 2020
- *      Author: simonm
- */
+//------------------------------------------------------------------------------
+// Copyright (c) 2011-2014 by European Organization for Nuclear Research (CERN)
+// Author: Michal Simon <michal.simon@cern.ch>
+//------------------------------------------------------------------------------
+// This file is part of the XRootD software suite.
+//
+// XRootD is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// XRootD is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with XRootD.  If not, see <http://www.gnu.org/licenses/>.
+//
+// In applying this licence, CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+//------------------------------------------------------------------------------
 
 #include "XrdEc/XrdEcStrmWriter.hh"
 #include "XrdEc/XrdEcThreadPool.hh"
@@ -275,7 +292,8 @@ namespace XrdEc
       //-----------------------------------------------------------------------
       // close ZIP archives with data
       //-----------------------------------------------------------------------
-      closes.emplace_back( XrdCl::CloseArchive( *dataarchs[i] ) );
+      if( dataarchs[i]->IsOpen() )
+        closes.emplace_back( XrdCl::CloseArchive( *dataarchs[i] ) );
       //-----------------------------------------------------------------------
       // replicate the metadata
       //-----------------------------------------------------------------------

diff --git a/src/XrdEc/XrdEcStrmWriter.hh b/src/XrdEc/XrdEcStrmWriter.hh
@@ -1,9 +1,26 @@
-/*
- * XrdEcStrmWriter.hh
- *
- *  Created on: 5 May 2020
- *      Author: simonm
- */
+//------------------------------------------------------------------------------
+// Copyright (c) 2011-2014 by European Organization for Nuclear Research (CERN)
+// Author: Michal Simon <michal.simon@cern.ch>
+//------------------------------------------------------------------------------
+// This file is part of the XRootD software suite.
+//
+// XRootD is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// XRootD is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with XRootD.  If not, see <http://www.gnu.org/licenses/>.
+//
+// In applying this licence, CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+//------------------------------------------------------------------------------
 
 #ifndef SRC_XRDEC_XRDECSTRMWRITER_HH_
 #define SRC_XRDEC_XRDECSTRMWRITER_HH_