Author: mlytwyn
Date: Wed Feb 4 22:04:46 2015
New Revision: 38333
URL: http://svn.gna.org/viewcvs/gnustep?rev=38333&view=rev
Log:
Fix multiple callbacks for didNotResolve service
Modified:
libs/base/branches/gnustep_testplant_branch/Source/GSMDNSNetServices.m
Modified: libs/base/branches/gnustep_testplant_branch/Source/GSMDNSNetServices.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/branches/gnustep_testplant_branch/Source/GSMDNSNetServices.m?rev=38333&r1=38332&r2=38333&view=diff
==============================================================================
--- libs/base/branches/gnustep_testplant_branch/Source/GSMDNSNetServices.m
(original)
+++ libs/base/branches/gnustep_testplant_branch/Source/GSMDNSNetServices.m
Wed Feb 4 22:04:46 2015
@@ -1007,9 +1007,9 @@
service = (Service *) _reserved;
+ LOCK(service);
if (service->timeout)
{
- LOCK(service);
{
[service->timeout invalidate];
DESTROY(service->timeout);
@@ -1019,8 +1019,8 @@
[self netService: self
didNotResolve: CreateError(self, NSNetServicesTimeoutError)];
}
- UNLOCK(service);
- }
+ }
+ UNLOCK(service);
}
/**
@@ -1118,8 +1118,6 @@
if (kDNSServiceErr_NoError != errorCode)
{
// Notify delegate...
- [self netService: self
- didNotResolve: CreateError(self, errorCode)];
[self stopResolving: self];
}
else
@@ -1173,8 +1171,6 @@
if (kDNSServiceErr_NoError != errorCode)
{
// Notify delegate...
- [self netService: self
- didNotResolve: CreateError(self, errorCode)];
[self stopResolving: self];
}
else
@@ -1182,12 +1178,11 @@
if (([self addresses] == nil) || ([[self addresses] count] == 0))
{
// Notify delegate...
- [self netService: self
- didNotResolve: CreateError(self, errorCode)];
[self stopResolving: self];
}
else
{
+ // timeout should have been stopped byt the query results
processing...
// notify the delegate
[self netServiceDidResolveAddress: self];
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
