Skip to content

Commit adf10f4

Browse files
radekdoulikSteve Pfister
authored andcommitted
[jnimarshalmethod-gen] Do not open assemblies for writting with -o
Do not open the assemblies as `ReadWrite` when using `-o` option. It is not needed as they will not be overwritten and may be read only.
1 parent 70396fc commit adf10f4

File tree

1 file changed

+6
-6
lines changed
  • tools/jnimarshalmethod-gen

1 file changed

+6
-6
lines changed

tools/jnimarshalmethod-gen/App.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,17 +153,17 @@ void ProcessAssemblies (List<string> assemblies)
153153
{
154154
CreateJavaVM (jvmDllPath);
155155

156-
var readWriteParameters = new ReaderParameters {
156+
var readerParameters = new ReaderParameters {
157157
AssemblyResolver = resolver,
158158
InMemory = true,
159159
ReadSymbols = true,
160-
ReadWrite = true,
160+
ReadWrite = string.IsNullOrEmpty (outDirectory),
161161
};
162-
var readWriteParametersNoSymbols = new ReaderParameters {
162+
var readerParametersNoSymbols = new ReaderParameters {
163163
AssemblyResolver = resolver,
164164
InMemory = true,
165165
ReadSymbols = false,
166-
ReadWrite = true,
166+
ReadWrite = string.IsNullOrEmpty (outDirectory),
167167
};
168168

169169
foreach (var r in references) {
@@ -185,12 +185,12 @@ void ProcessAssemblies (List<string> assemblies)
185185
resolver.SearchDirectories.Add (Path.GetDirectoryName (assembly));
186186
AssemblyDefinition ad;
187187
try {
188-
ad = AssemblyDefinition.ReadAssembly (assembly, readWriteParameters);
188+
ad = AssemblyDefinition.ReadAssembly (assembly, readerParameters);
189189
resolver.AddToCache (ad);
190190
} catch (Exception) {
191191
if (Verbose)
192192
Warning ($"Unable to read assembly '{assembly}' with symbols. Retrying to load it without them.");
193-
ad = AssemblyDefinition.ReadAssembly (assembly, readWriteParametersNoSymbols);
193+
ad = AssemblyDefinition.ReadAssembly (assembly, readerParametersNoSymbols);
194194
resolver.AddToCache (ad);
195195
}
196196

0 commit comments

Comments
 (0)