[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: [soprano] client: Fix soprano error reporting / connection status bug
From:       Vishesh Handa <handa.vish () gmail ! com>
Date:       2012-12-18 19:44:31
Message-ID: CAOPTMKCLgWcpp-nb9e3V3=0MbiE=VRX_2R5tUV_ENQeM5AQbUw () mail ! gmail ! com
[Download RAW message or body]

Dude

RC1 freeze. Next time wait for a day :P

http://techbase.kde.org/Schedules/KDE4/4.10_Release_Schedule


On Tue, Dec 18, 2012 at 10:42 PM, Simeon Bird <spb@ias.edu> wrote:

> Git commit 6a3fadb5bc005eed8406e4ed72ede1e5e6905ffe by Simeon Bird.
> Committed on 18/12/2012 at 18:09.
> Pushed by sbird into branch 'master'.
>
> Fix soprano error reporting / connection status bug
>
> M  +1    -0    client/localsocketclient.cpp
> M  +1    -0    client/socket.cpp
>
> http://commits.kde.org/soprano/6a3fadb5bc005eed8406e4ed72ede1e5e6905ffe
>
> diff --git a/client/localsocketclient.cpp b/client/localsocketclient.cpp
> index 48ac0a0..6fc35c6 100644
> --- a/client/localsocketclient.cpp
> +++ b/client/localsocketclient.cpp
> @@ -131,6 +131,7 @@ bool Soprano::Client::LocalSocketClient::connect(
> const QString& name )
>              return true;
>          }
>          else {
> +            setError( d->connection.lastError() );
>              return false;
>          }
>      }
> diff --git a/client/socket.cpp b/client/socket.cpp
> index 8c3ed04..9c66ea4 100644
> --- a/client/socket.cpp
> +++ b/client/socket.cpp
> @@ -220,6 +220,7 @@ bool Soprano::LocalSocket::open()
>      if ( ::connect( m_handle, (struct sockaddr *)&servAddr, sizeof(
> servAddr ) ) < 0 ) {
>          setError( QString::fromLatin1( "Could not connect to server at %1
> (%2)" ).arg( m_path ).arg( strerror(errno) ) );
>          ::close( m_handle );
> +        m_handle = -1;
>          return false;
>      }
>
>

[Attachment #3 (text/html)]

<div dir="ltr"><div>Dude<br><br></div>RC1 freeze. Next time wait for a day \
:P<br><br><a href="http://techbase.kde.org/Schedules/KDE4/4.10_Release_Schedule">http://techbase.kde.org/Schedules/KDE4/4.10_Release_Schedule</a><br>
 <div><div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Dec 18, \
2012 at 10:42 PM, Simeon Bird <span dir="ltr">&lt;<a href="mailto:spb@ias.edu" \
target="_blank">spb@ias.edu</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" \
style="margin:0px 0px 0px 0.8ex;border-left:1px solid \
rgb(204,204,204);padding-left:1ex"> Git commit \
6a3fadb5bc005eed8406e4ed72ede1e5e6905ffe by Simeon Bird.<br> Committed on 18/12/2012 \
at 18:09.<br> Pushed by sbird into branch &#39;master&#39;.<br>
<br>
Fix soprano error reporting / connection status bug<br>
<br>
M  +1    -0    client/localsocketclient.cpp<br>
M  +1    -0    client/socket.cpp<br>
<br>
<a href="http://commits.kde.org/soprano/6a3fadb5bc005eed8406e4ed72ede1e5e6905ffe" \
target="_blank">http://commits.kde.org/soprano/6a3fadb5bc005eed8406e4ed72ede1e5e6905ffe</a><br>
 <br>
diff --git a/client/localsocketclient.cpp b/client/localsocketclient.cpp<br>
index 48ac0a0..6fc35c6 100644<br>
--- a/client/localsocketclient.cpp<br>
+++ b/client/localsocketclient.cpp<br>
@@ -131,6 +131,7 @@ bool Soprano::Client::LocalSocketClient::connect( const \
QString&amp; name )<br>  return true;<br>
         }<br>
         else {<br>
+            setError( d-&gt;connection.lastError() );<br>
             return false;<br>
         }<br>
     }<br>
diff --git a/client/socket.cpp b/client/socket.cpp<br>
index 8c3ed04..9c66ea4 100644<br>
--- a/client/socket.cpp<br>
+++ b/client/socket.cpp<br>
@@ -220,6 +220,7 @@ bool Soprano::LocalSocket::open()<br>
     if ( ::connect( m_handle, (struct sockaddr *)&amp;servAddr, sizeof( servAddr ) ) \
                &lt; 0 ) {<br>
         setError( QString::fromLatin1( &quot;Could not connect to server at %1 \
(%2)&quot; ).arg( m_path ).arg( strerror(errno) ) );<br>  ::close( m_handle );<br>
+        m_handle = -1;<br>
         return false;<br>
     }<br>
<br>
</blockquote></div><br></div></div></div></div>



[prev in list] [next in list] [prev in thread] [next in thread]