diff --git a/net/alien/src/TAlienFile.cxx b/net/alien/src/TAlienFile.cxx index bed313d1d64580fd3e5f93395c1123167c832b2b..78ab71735d51cc790eb6605d80d4b5c1fddb5ddd 100644 --- a/net/alien/src/TAlienFile.cxx +++ b/net/alien/src/TAlienFile.cxx @@ -503,6 +503,7 @@ TAlienFile::~TAlienFile() //______________________________________________________________________________ void TAlienFile::Close(Option_t * option) { + //close a file if (!IsOpen()) return; // Close file. diff --git a/net/alien/src/TAlienJDL.cxx b/net/alien/src/TAlienJDL.cxx index 30e47911e85817646dec47107b7749e817c54017..e00677cea00abf381e4c86131309a5d6e8602606 100644 --- a/net/alien/src/TAlienJDL.cxx +++ b/net/alien/src/TAlienJDL.cxx @@ -379,32 +379,32 @@ void TAlienJDL::Parse(const char * filename) TString lineString; Char_t line[1024]; while ( file.good() ) { - file.getline ( line,1024 ); - lineString=line; - if ( !lineString.IsNull() ) { - TObjArray *strCmdOrValue = lineString.Tokenize ( "=" ); - TObjString*strObjCmd = ( TObjString* ) strCmdOrValue->At ( 0 ); - TObjString*strObjValue = ( TObjString* ) strCmdOrValue->At ( 1 ); - TString cmdString ( strObjCmd->GetString() ); - TString valueString ( strObjValue->GetString() ); - cmdString.ReplaceAll ( " ","" ); - valueString.ReplaceAll ( " ","" ); - valueString.ReplaceAll ( "\",\"","`" ); - - TObjArray *strValues = valueString.Tokenize ( "`" ); - for ( Int_t i=0;i<strValues->GetEntries();i++ ) { - TObjString *strObjValue2 = ( TObjString* ) strValues->At ( i ); - TString valueString2 ( strObjValue2->GetString() ); - valueString2.ReplaceAll ( "\"","" ); - valueString2.ReplaceAll ( "{","" ); - valueString2.ReplaceAll ( "}","" ); - valueString2.ReplaceAll ( ";","" ); - SetValueByCmd ( cmdString,valueString2 ); - } - } - } - - file.close(); + file.getline ( line,1024 ); + lineString=line; + if ( !lineString.IsNull() ) { + TObjArray *strCmdOrValue = lineString.Tokenize ( "=" ); + TObjString*strObjCmd = ( TObjString* ) strCmdOrValue->At ( 0 ); + TObjString*strObjValue = ( TObjString* ) strCmdOrValue->At ( 1 ); + TString cmdString ( strObjCmd->GetString() ); + TString valueString ( strObjValue->GetString() ); + cmdString.ReplaceAll ( " ","" ); + valueString.ReplaceAll ( " ","" ); + valueString.ReplaceAll ( "\",\"","`" ); + + TObjArray *strValues = valueString.Tokenize ( "`" ); + for ( Int_t i=0;i<strValues->GetEntries();i++ ) { + TObjString *strObjValue2 = ( TObjString* ) strValues->At ( i ); + TString valueString2 ( strObjValue2->GetString() ); + valueString2.ReplaceAll ( "\"","" ); + valueString2.ReplaceAll ( "{","" ); + valueString2.ReplaceAll ( "}","" ); + valueString2.ReplaceAll ( ";","" ); + SetValueByCmd ( cmdString,valueString2 ); + } + } + } + + file.close(); } //______________________________________________________________________________