Commit 4af9c272 authored by Victor Kotlyar's avatar Victor Kotlyar
Browse files

Ported commits 7c9bf47bb5b6239c4e07a452c282b467800260c8

15194eaf055ddf277cd7869bd89b8f42655ede9f from castor/master

Fixed parsing of the xroot URLs for ceph case.
parent 6690990a
......@@ -40,7 +40,7 @@ namespace diskFile {
DiskFileFactory::DiskFileFactory(const std::string & remoteFileProtocol,
const std::string & xrootPrivateKeyFile):
m_NoURLLocalFile("^(localhost:|)(/.*)$"),
m_NoURLRemoteFile("^(.*:)(/.*)$"),
m_NoURLRemoteFile("^([^:]*:)(.*)$"),
m_NoURLRadosStriperFile("^localhost:([^/]+)/(.*)$"),
m_URLLocalFile("^file://(.*)$"),
m_URLEosFile("^eos://(.*)$"),
......@@ -435,7 +435,7 @@ XrootC2FSWriteFile::XrootC2FSWriteFile(const std::string &url,
throw cta::exception::Exception(
std::string("In XrootC2FSWriteFile::XrootC2FSWriteFile could not find the scheme[x]root:// in URL "+
url));
size_t pathPos = url.find("//", schemePos + scheme.size());
size_t pathPos = url.find("/", schemePos + scheme.size());
if (std::string::npos == pathPos)
throw cta::exception::Exception(
std::string("In XrootC2FSWriteFile::XrootC2FSWriteFile could not path in URL "+
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment