Skip to content

Commit e15e6b9

Browse files
Fix rebase merge artifacts in JavaPeerProxy
The rebase auto-merge duplicated the JavaArrayProxy attribute class in JavaPeerProxy.cs (one terse copy from this branch, one documented copy from core); remove the duplicate. Also align JavaPeerProxy<T>.GetContainerFactory to use the JavaPeerContainerFactory<T>.Instance singleton (its constructor is private) instead of 'new'. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent e97aee4 commit e15e6b9

1 file changed

Lines changed: 1 addition & 9 deletions

File tree

src/Mono.Android/Java.Interop/JavaPeerProxy.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,7 @@ protected JavaPeerProxy (string jniName, Type? invokerType)
150150
}
151151

152152
public override JavaPeerContainerFactory? GetContainerFactory ()
153-
=> new JavaPeerContainerFactory<T> ();
154-
}
155-
156-
[AttributeUsage (AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
157-
public abstract class JavaArrayProxy : Attribute
158-
{
159-
public abstract Type[] GetArrayTypes ();
160-
161-
public abstract Array CreateManagedArray (int length);
153+
=> JavaPeerContainerFactory<T>.Instance;
162154
}
163155

164156
/// <summary>

0 commit comments

Comments
 (0)