@@ -91,6 +91,7 @@ <Compile Include="Create.cs" /> <Compile Include="TestWcfDispatcher.cs" /> <Compile Include="TestWcfListener.cs" /> + <Compile Include="TestWorkerThreads.cs" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\IServiceOriented.ServiceBus\IServiceOriented.ServiceBus.csproj"> IServiceOriented.ServiceBus.UnitTests/IServiceOriented.ServiceBus.UnitTests.csproj @@ -8,7 +8,7 @@ using System.IO; namespace IServiceOriented.ServiceBus.Delivery.Formatters { - public class ConverterMessageDeliveryReader<T> : MessageDeliveryReader + internal class ConverterMessageDeliveryReader<T> : MessageDeliveryReader { public ConverterMessageDeliveryReader(Stream stream, bool isOwner, MessageEncoder encoder, int maxSizeOfHeaders) : base(stream, isOwner) { IServiceOriented.ServiceBus/Delivery/Formatters/ConverterMessageDeliveryReader.cs @@ -8,7 +8,7 @@ using System.IO; namespace IServiceOriented.ServiceBus.Delivery.Formatters { - public class ConverterMessageDeliveryWriter<T> : MessageDeliveryWriter + internal class ConverterMessageDeliveryWriter<T> : MessageDeliveryWriter { public ConverterMessageDeliveryWriter(Stream baseStream, bool isOwner, MessageEncoder encoder) : base(baseStream, isOwner) { IServiceOriented.ServiceBus/Delivery/Formatters/ConverterMessageDeliveryWriter.cs @@ -17,7 +17,7 @@ using IServiceOriented.ServiceBus.Listeners; namespace IServiceOriented.ServiceBus.Delivery.Formatters { - public class DataContractMessageDeliveryConverter : MessageDeliveryConverter + internal class DataContractMessageDeliveryConverter : MessageDeliveryConverter { public DataContractMessageDeliveryConverter(Type interfaceType) { IServiceOriented.ServiceBus/Delivery/Formatters/DataContractMessageDeliveryConverter.cs @@ -17,19 +17,19 @@ using IServiceOriented.ServiceBus.Listeners; namespace IServiceOriented.ServiceBus.Delivery.Formatters { - public class MessageContractMessageDeliveryConverter : MessageDeliveryConverter + internal class MessageContractMessageDeliveryConverter : MessageDeliveryConverter { public MessageContractMessageDeliveryConverter(Type contractType) { foreach (WcfMessageInformation information in WcfUtils.GetMessageInformation(contractType)) { - cacheConverter(contractType, information.MessageType, information.Action); + cacheConverter(information.MessageType, information.Action); } } Dictionary<string, TypedMessageConverter> _converterHash = new Dictionary<string, TypedMessageConverter>(); - void cacheConverter(Type contractType, Type objType, string action) + void cacheConverter(Type objType, string action) { string key = objType + ":" + action; if (!_converterHash.ContainsKey(key)) IServiceOriented.ServiceBus/Delivery/Formatters/MessageContractMessageDeliveryConverter.cs @@ -6,7 +6,7 @@ using System.ServiceModel.Channels; namespace IServiceOriented.ServiceBus.Delivery.Formatters { - public class RawMessageMessageDeliveryConverter : MessageContractMessageDeliveryConverter + internal class RawMessageMessageDeliveryConverter : MessageContractMessageDeliveryConverter { public RawMessageMessageDeliveryConverter(Type contractType) : base(contractType) IServiceOriented.ServiceBus/Delivery/Formatters/RawMessageMessageDeliveryConverter.cs @@ -16,3 +16,6 @@ [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "IServiceOriented.ServiceBus.Threading")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "IServiceOriented.ServiceBus.SimpleServiceLocator.#RegisterService(System.Type)")] [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Scope = "member", Target = "IServiceOriented.ServiceBus.SimpleServiceLocator.#RegisterService(System.Type,System.String)")] +[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Scope = "member", Target = "IServiceOriented.ServiceBus.IO.MessageDeliveryReader.#System.IDisposable.Dispose()")] +[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Scope = "member", Target = "IServiceOriented.ServiceBus.IO.MessageDeliveryWriter.#System.IDisposable.Dispose()")] +[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "IServiceOriented.ServiceBus.IO")] IServiceOriented.ServiceBus/GlobalSuppressions.cs @@ -8,7 +8,7 @@ namespace IServiceOriented.ServiceBus.IO { public abstract class MessageDeliveryReader : IDisposable { - public MessageDeliveryReader(Stream stream, bool isOwner) + protected MessageDeliveryReader(Stream stream, bool isOwner) { BaseStream = stream; OwnsStream = isOwner; IServiceOriented.ServiceBus/IO/MessageDeliveryReader.cs @@ -8,7 +8,7 @@ namespace IServiceOriented.ServiceBus.IO { public abstract class MessageDeliveryWriter : IDisposable { - public MessageDeliveryWriter(Stream stream, bool isOwner) + protected MessageDeliveryWriter(Stream stream, bool isOwner) { BaseStream = stream; OwnsStream = isOwner; IServiceOriented.ServiceBus/IO/MessageDeliveryWriter.cs @@ -83,7 +83,7 @@ namespace IServiceOriented.ServiceBus.Listeners { fileStream = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.None); } - catch(FileNotFoundException) + catch (FileNotFoundException) { throw; } @@ -97,6 +97,13 @@ namespace IServiceOriented.ServiceBus.Listeners throw new TimeoutException("Timed out while trying to open file"); } } + finally + { + if (fileStream != null) + { + fileStream.Close(); + } + } } IServiceOriented.ServiceBus/Listeners/FileSystemListener.cs @@ -16,7 +16,17 @@ namespace IServiceOriented.ServiceBus.Threading private readonly TimeSpan Timeout; private readonly Action<TimeSpan, object> UnitOfWork; - + + public int Count + { + get + { + lock (_workers) + { + return _workers.Count; + } + } + } class WorkerInfo { public AutoResetEvent StopEvent; @@ -47,9 +57,9 @@ namespace IServiceOriented.ServiceBus.Threading List<WorkerInfo> _workers = new List<WorkerInfo>(); - public void AddWorker() + public int AddWorker() { - AddWorker(null); + return AddWorker(null); } public int AddWorker(object state) IServiceOriented.ServiceBus/Threading/WorkerThreads.cs 083730729686d6730e7c206e83c0752c56756e38 jezell jezell@gmail.com http://github.com/jezell/iserviceoriented/commit/15b251d5a3c327bd976d58299c7b88aebcffad66 15b251d5a3c327bd976d58299c7b88aebcffad66 2008-10-15T15:14:22-07:00 2008-10-15T15:14:22-07:00 Code analysis cleanup 81d3f2c748e0c983e1facb19e1ba8524913fc121 jezell jezell@gmail.com