summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-06-30 13:07:30 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-06-30 13:07:30 +0000
commit01b63b042268d507b2719c5fb22f83c999ffa7b1 (patch)
tree91ec759675ca6ae7176e458bffbdcd116834450e /configmgr
parent386ce102a9fd0dc35cb4d7b7bbca2a4917a59c65 (diff)
INTEGRATION: CWS cfgrc01 (1.2.12); FILE MERGED
2003/06/26 14:26:10 jb 1.2.12.1: #110464# Prevent unnecessary exception when running as root
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/backend/binarycache.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/configmgr/source/backend/binarycache.cxx b/configmgr/source/backend/binarycache.cxx
index beb3370588fd..c3b0421107b6 100644
--- a/configmgr/source/backend/binarycache.cxx
+++ b/configmgr/source/backend/binarycache.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: binarycache.cxx,v $
*
-* $Revision: 1.2 $
+* $Revision: 1.3 $
*
-* last change: $Author: vg $ $Date: 2003-05-26 08:03:34 $
+* last change: $Author: hr $ $Date: 2003-06-30 14:07:30 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -122,7 +122,12 @@ namespace configmgr
if (!_rsURL.getLength())
return false;
- OSL_ENSURE(isValidFileURL(_rsURL), "File URL is invalid");
+ if (!isValidFileURL(_rsURL))
+ {
+ OSL_TRACE("Binary cache: File URL %s is invalid.",
+ rtl::OUStringToOString(_rsURL,RTL_TEXTENCODING_ASCII_US).getStr());
+ return false;
+ }
rtl::OUString sBasePath = _rsURL;
OSL_VERIFY(osl_Process_E_None == osl_getProcessWorkingDir(&sBasePath.pData));
@@ -289,4 +294,4 @@ namespace configmgr
}
// -----------------------------------------------------------------------------
-} \ No newline at end of file
+}