Author: rfm
Date: Thu Sep 4 23:24:19 2014
New Revision: 38060
URL: http://svn.gna.org/viewcvs/gnustep?rev=38060&view=rev
Log:
fix missing clear
Modified:
libs/ec/trunk/ChangeLog
libs/ec/trunk/EcAlarmDestination.m
libs/ec/trunk/EcProcess.m
Modified: libs/ec/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/ChangeLog?rev=38060&r1=38059&r2=38060&view=diff
==============================================================================
--- libs/ec/trunk/ChangeLog (original)
+++ libs/ec/trunk/ChangeLog Thu Sep 4 23:24:19 2014
@@ -1,3 +1,8 @@
+2014-09-04 Richard Frith-Macdonald <[email protected]>
+
+ * EcProcess.m: Fix missing clear after unable to register with name
+ server.
+
2014-09-02 Richard Frith-Macdonald <[email protected]>
* EcControl.m: If a Command server on a host registers and we already
Modified: libs/ec/trunk/EcAlarmDestination.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcAlarmDestination.m?rev=38060&r1=38059&r2=38060&view=diff
==============================================================================
--- libs/ec/trunk/EcAlarmDestination.m (original)
+++ libs/ec/trunk/EcAlarmDestination.m Thu Sep 4 23:24:19 2014
@@ -153,7 +153,8 @@
return nil;
}
when = [[NSDate alloc] initWithTimeIntervalSinceNow: 0.1];
- [[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode beforeDate:
when];
+ [[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode
+ beforeDate: when];
[when release];
}
}
@@ -311,7 +312,8 @@
return;
}
when = [[NSDate alloc] initWithTimeIntervalSinceNow: 0.1];
- [[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode beforeDate:
when];
+ [[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode
+ beforeDate: when];
[when release];
}
}
Modified: libs/ec/trunk/EcProcess.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/EcProcess.m?rev=38060&r1=38059&r2=38060&view=diff
==============================================================================
--- libs/ec/trunk/EcProcess.m (original)
+++ libs/ec/trunk/EcProcess.m Thu Sep 4 23:24:19 2014
@@ -2348,6 +2348,20 @@
[self cmdFlushLogs];
[arp release];
return 2;
+ }
+ else
+ {
+ EcAlarm *a;
+
+ a = [EcAlarm alarmForManagedObject: nil
+ at: nil
+ withEventType: EcAlarmEventTypeProcessingError
+ probableCause: EcAlarmSoftwareProgramAbnormallyTerminated
+ specificProblem: @"Unable to register"
+ perceivedSeverity: EcAlarmSeverityCleared
+ proposedRepairAction: nil
+ additionalText: nil];
+ [self alarm: a];
}
[c setDelegate: self];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
