Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unadvise/EventProxy.close() #57

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix unadvise/EventProxy.close() #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
976ac65
make EventProxy thread aware so that unadvice will be called in the c…
protogenes Jan 5, 2017
68e70b2
also execute advise on the COMThread of the owner
protogenes Feb 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions runtime/src/main/java/com4j/EventProxy.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ final class EventProxy<T> implements EventCookie {

private final EventInterfaceDescriptor<T> descriptor;
private final T javaObject;
private final ComThread thread;

/**
* Pointer to the native proxy.
Expand All @@ -35,9 +36,10 @@ final class EventProxy<T> implements EventCookie {
* Creates a new event proxy that implements the event interface {@code intf}
* and delivers events to {@code javaObject}.
*/
EventProxy(Class<T> intf, T javaObject) {
EventProxy(Class<T> intf, T javaObject, ComThread thread) {
this.descriptor = getDescriptor(intf);
this.javaObject = javaObject;
this.thread = thread;
}

/**
Expand All @@ -50,7 +52,7 @@ public Void call() {
Native.unadvise(nativeProxy);
return null;
}
}.execute();
}.execute(thread);
nativeProxy = 0;
}
}
Expand Down
4 changes: 2 additions & 2 deletions runtime/src/main/java/com4j/Wrapper.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public EventProxy<?> call() {
throw new ComException("This object doesn't have event source",-1);
GUID iid = COM4J.getIID(eventInterface);
Com4jObject cp = cpc.FindConnectionPoint(iid);
EventProxy<T> proxy = new EventProxy<T>(eventInterface, object);
EventProxy<T> proxy = new EventProxy<T>(eventInterface, object, thread);
proxy.nativeProxy = Native.advise(cp.getPointer(), proxy,iid.v[0], iid.v[1]);

// clean up resources to be nice
Expand All @@ -284,7 +284,7 @@ public EventProxy<?> call() {

return proxy;
}
}.execute();
}.execute(thread);
}

@Override
Expand Down