From kde-commits  Tue Dec 18 19:44:31 2012
From: Vishesh Handa <handa.vish () gmail ! com>
Date: Tue, 18 Dec 2012 19:44:31 +0000
To: kde-commits
Subject: Re: [soprano] client: Fix soprano error reporting / connection status bug
Message-Id: <CAOPTMKCLgWcpp-nb9e3V3=0MbiE=VRX_2R5tUV_ENQeM5AQbUw () mail ! gmail ! com>
X-MARC-Message: https://marc.info/?l=kde-commits&m=135585916405071
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--e89a8ff2534a1d01b404d1258fe7"

--e89a8ff2534a1d01b404d1258fe7
Content-Type: text/plain; charset=ISO-8859-1

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;
>      }
>
>

--e89a8ff2534a1d01b404d1258fe7
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div>Dude<br><br></div>RC1 freeze. Next time wait for a da=
y :P<br><br><a href=3D"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=3D"gmail_extra"><br><br><div class=3D"gmail_quote">On =
Tue, Dec 18, 2012 at 10:42 PM, Simeon Bird <span dir=3D"ltr">&lt;<a href=3D=
"mailto:spb@ias.edu" target=3D"_blank">spb@ias.edu</a>&gt;</span> wrote:<br=
><blockquote class=3D"gmail_quote" style=3D"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 =A0+1 =A0 =A0-0 =A0 =A0client/localsocketclient.cpp<br>
M =A0+1 =A0 =A0-0 =A0 =A0client/socket.cpp<br>
<br>
<a href=3D"http://commits.kde.org/soprano/6a3fadb5bc005eed8406e4ed72ede1e5e=
6905ffe" target=3D"_blank">http://commits.kde.org/soprano/6a3fadb5bc005eed8=
406e4ed72ede1e5e6905ffe</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>
=A0 =A0 =A0 =A0 =A0 =A0 =A0return true;<br>
=A0 =A0 =A0 =A0 =A0}<br>
=A0 =A0 =A0 =A0 =A0else {<br>
+ =A0 =A0 =A0 =A0 =A0 =A0setError( d-&gt;connection.lastError() );<br>
=A0 =A0 =A0 =A0 =A0 =A0 =A0return false;<br>
=A0 =A0 =A0 =A0 =A0}<br>
=A0 =A0 =A0}<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>
=A0 =A0 =A0if ( ::connect( m_handle, (struct sockaddr *)&amp;servAddr, size=
of( servAddr ) ) &lt; 0 ) {<br>
=A0 =A0 =A0 =A0 =A0setError( QString::fromLatin1( &quot;Could not connect t=
o server at %1 (%2)&quot; ).arg( m_path ).arg( strerror(errno) ) );<br>
=A0 =A0 =A0 =A0 =A0::close( m_handle );<br>
+ =A0 =A0 =A0 =A0m_handle =3D -1;<br>
=A0 =A0 =A0 =A0 =A0return false;<br>
=A0 =A0 =A0}<br>
<br>
</blockquote></div><br></div></div></div></div>

--e89a8ff2534a1d01b404d1258fe7--