[Libreoffice-commits] core.git: ucb/source

[Caolán McNamara]

 ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx |    4 +---
 ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit a9a30dbe8fa4d4b8693d11df072626f6cbc8631c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 30 15:10:35 2016 +0000

    unexpected exception seen in tinderbox
    
      #1  0x00002b464842f53a in __GI_abort () at abort.c:89
              save_stage = 2
              act = {__sigaction_handler = {sa_handler = 0x2b4648169a60 <typeinfo name for com::sun::star::uno::RuntimeException>, sa_sigaction = 0x2b4648169a60 <typeinfo name for com::sun::star::uno::RuntimeException>}, sa_mask = {__val = {47580863731936, 47582668825824, 47580850742064, 47580863731456, 2, 47580871027780, 0, 47582668825824, 47580863731456, 47580873315224, 47580863731936, 47582791173728, 47582791173728, 1, 33350960, 47582668313696}}, sa_flags = -1151509448, sa_restorer = 0x1fce530}
              sigs = {__val = {32, 0 <repeats 15 times>}}
      #2  0x00002b4648e3efdd in __gnu_cxx::__verbose_terminate_handler() () at ../../../../libstdc++-v3/libsupc++/vterminate.cc:95
              terminating = true
              t = <optimized out>
      #3  0x00002b4648e3ce56 in __cxxabiv1::__terminate(void (*)()) (handler=<optimized out>) at ../../../../libstdc++-v3/libsupc++/eh_terminate.cc:47
      #4  0x00002b4648e3cea1 in std::terminate() () at ../../../../libstdc++-v3/libsupc++/eh_terminate.cc:57
      #5  0x00002b4648e3ceb6 in __cxxabiv1::__unexpected(void (*)()) (handler=<optimized out>) at ../../../../libstdc++-v3/libsupc++/eh_terminate.cc:63
      #6  0x00002b4648e3cae2 in __cxxabiv1::__cxa_call_unexpected(void*) (exc_obj_in=0x2b46b40ad4b0) at ../../../../libstdc++-v3/libsupc++/eh_personality.cc:759
              info = {Start = 47582791163104, LPStart = 47582996646024, ttype_base = 0, TType = 0x2b46bb5d5e30 "", action_table = 0xffffffff <error: Cannot access memory at address 0xffffffff>, ttype_encoding = 1 ´\001´, call_site_encoding = 0 ´\000´}
              xh_lsda = 0x2b46c7aab0d4 "\377\233\261\201\200\200"
              xh_switch_value = -1
              exc_obj = 0x2b46b40ad4b0
              xh_terminate_handler = 0x2b4648e3ee70 <__gnu_cxx::__verbose_terminate_handler()>
      #7  0x00002b46c79c6af9 in webdav_ucp::DAVResourceAccess::GET(std::__debug::vector<rtl::OUString, std::allocator<rtl::OUString> > const&, webdav_ucp::DAVResource&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&) (this=0x2b46b410ceb0, rHeaderNames=std::__debug::vector of length 0, capacity 0, rResource=..., xEnv=uno::Reference to ((anonymous namespace)::UpdateInformationProvider *) 0x2b46bb153918) at /home/tinderbox/master/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx:497
              errorCount = 0
              bRetry = false
              xStream = empty uno::Reference
    
    Change-Id: Iaa3ec435af6bed267235a9025fc9334058f20475

diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
index db488b0..ea15233 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
@@ -451,12 +451,11 @@ void DAVResourceAccess::GET(
     while ( bRetry );
 }
 
-
 uno::Reference< io::XInputStream > DAVResourceAccess::GET(
     const std::vector< OUString > & rHeaderNames,
     DAVResource & rResource,
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw( DAVException )
+  throw (css::uno::RuntimeException, DAVException)
 {
     initialize();
 
@@ -496,7 +495,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET(
     return xStream;
 }
 
-
 // used as HEAD substitute when HEAD is not implemented on server
 void DAVResourceAccess::GET0(
     DAVRequestHeaders &rRequestHeaders,
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
index 47f0bd0..8bc9997 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
@@ -132,7 +132,7 @@ public:
     GET( const std::vector< OUString > & rHeaderNames, // empty == 'all'
          DAVResource & rResource,
          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
+        throw (css::uno::RuntimeException, DAVException);
 
     // used as HEAD substitute when HEAD is not implemented on server
     void