@@ -135,9 +135,12 @@ private static ModuleCollection GetLoadedModules(IExceptionlessLog log, bool inc
135
135
} catch { }
136
136
}
137
137
138
- var module = assembly . ToModuleInfo ( log ) ;
138
+ var module = assembly . ToModuleInfo ( ) ;
139
+ if ( module . ModuleId > 0 )
140
+ continue ;
141
+
139
142
module . ModuleId = id ;
140
- modules . Add ( assembly . ToModuleInfo ( log ) ) ;
143
+ modules . Add ( module ) ;
141
144
142
145
id ++ ;
143
146
}
@@ -221,18 +224,15 @@ private static int GetModuleId(Error root, System.Reflection.Module module) {
221
224
return - 1 ;
222
225
}
223
226
224
- public static Module ToModuleInfo ( this System . Reflection . Module module , IExceptionlessLog log = null ) {
225
- return ToModuleInfo ( module . Assembly , log ) ;
227
+ public static Module ToModuleInfo ( this System . Reflection . Module module ) {
228
+ return ToModuleInfo ( module . Assembly ) ;
226
229
}
227
230
228
- public static Module ToModuleInfo ( this Assembly assembly , IExceptionlessLog log = null ) {
231
+ public static Module ToModuleInfo ( this Assembly assembly ) {
229
232
if ( assembly == null )
230
233
return null ;
231
234
232
- if ( log == null )
233
- log = new NullExceptionlessLog ( ) ;
234
-
235
- Module module = _moduleCache . GetOrAdd ( assembly . FullName , k => {
235
+ return _moduleCache . GetOrAdd ( assembly . FullName , k => {
236
236
var mod = new Module ( ) ;
237
237
AssemblyName name = assembly . GetAssemblyName ( ) ;
238
238
if ( name != null ) {
@@ -258,16 +258,12 @@ public static Module ToModuleInfo(this Assembly assembly, IExceptionlessLog log
258
258
DateTime ? lastWriteTime = assembly . GetLastWriteTime ( ) ;
259
259
if ( lastWriteTime . HasValue )
260
260
mod . ModifiedDate = lastWriteTime . Value ;
261
+
262
+ if ( assembly == Assembly . GetEntryAssembly ( ) )
263
+ mod . IsEntry = true ;
261
264
262
265
return mod ;
263
266
} ) ;
264
-
265
- if ( module != null ) {
266
- if ( assembly == Assembly . GetEntryAssembly ( ) )
267
- module . IsEntry = true ;
268
- }
269
-
270
- return module ;
271
267
}
272
268
}
273
269
}
0 commit comments