summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-03-17 10:24:55 +0000
committerOliver Bolte <obo@openoffice.org>2004-03-17 10:24:55 +0000
commit3166d199e338233435c857511ecf379f05cc915b (patch)
tree00aa8dda6ff165f447c29c12bb2358e19be370ff /ucb
parentefd98f405c00784ec2368d05fcbe5bc2fc4bf45f (diff)
INTEGRATION: CWS kso9 (1.9.124); FILE MERGED
2004/02/25 10:26:54 kso 1.9.124.1: #112271# - Handle runtime changes of proxy configuration.
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/webdav/DAVSessionFactory.cxx36
1 files changed, 5 insertions, 31 deletions
diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
index e30aafe6772f..44da86e16be5 100644
--- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DAVSessionFactory.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: kso $ $Date: 2002-10-28 16:20:01 $
+ * last change: $Author: obo $ $Date: 2004-03-17 11:24:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -106,18 +106,8 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
NeonUri aURI( inUri );
std::auto_ptr< DAVSession > xElement(
- ( aURI.GetScheme().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "http" ) ) ||
- aURI.GetScheme().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "https" ) ) )
- ? new NeonSession(
- this, inUri, m_xProxyDecider->getProxy( aURI.GetScheme(),
- aURI.GetHost(),
- aURI.GetPort() ) )
- : new NeonSession(
- this, inUri, m_xProxyDecider->getProxy( aURI.GetScheme(),
- rtl::OUString() /* not used */,
- -1 /* not used */ ) ) );
+ new NeonSession( this, inUri, *m_xProxyDecider.get() ) );
+
aIt = m_aMap.insert( Map::value_type( inUri, xElement.get() ) ).first;
aIt->second->m_aContainerIt = aIt;
xElement.release();
@@ -139,23 +129,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
// call a little:
NeonUri aURI( inUri );
- if ( aURI.GetScheme().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "http" ) ) ||
- aURI.GetScheme().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( "https" ) ) )
- aIt->second = new NeonSession( this,
- inUri,
- m_xProxyDecider->getProxy(
- aURI.GetScheme(),
- aURI.GetHost(),
- aURI.GetPort() ) );
- else
- aIt->second = new NeonSession( this,
- inUri,
- m_xProxyDecider->getProxy(
- aURI.GetScheme(),
- rtl::OUString() /* not used */,
- -1 /* not used */ ) );
+ aIt->second = new NeonSession( this, inUri, *m_xProxyDecider.get() );
aIt->second->m_aContainerIt = aIt;
return aIt->second;
}