View | Details | Raw Unified | Return to bug 324850 | Differences between
and this patch

Collapse All | Expand All

(-)core/framework/org/eclipse/osgi/framework/console/ConsoleSession.java (-7 / +5 lines)
Lines 28-35 Link Here
28
 * </p>
28
 * </p>
29
 * @since 3.6
29
 * @since 3.6
30
 */
30
 */
31
public abstract class ConsoleSession implements ServiceFactory<ConsoleSession> {
31
public abstract class ConsoleSession implements ServiceFactory<Object> {
32
	private volatile ServiceRegistration<ConsoleSession> sessionRegistration;
32
	private volatile ServiceRegistration<Object> sessionRegistration;
33
33
34
	/**
34
	/**
35
	 * Called by the console implementation to free resources associated
35
	 * Called by the console implementation to free resources associated
Lines 39-45 Link Here
39
	 */
39
	 */
40
	public final void close() {
40
	public final void close() {
41
		doClose();
41
		doClose();
42
		ServiceRegistration<ConsoleSession> current = sessionRegistration;
42
		ServiceRegistration<Object> current = sessionRegistration;
43
		if (current != null) {
43
		if (current != null) {
44
			sessionRegistration = null;
44
			sessionRegistration = null;
45
			try {
45
			try {
Lines 78-86 Link Here
78
78
79
	/**
79
	/**
80
	 * @noreference This method is not intended to be referenced by clients.
80
	 * @noreference This method is not intended to be referenced by clients.
81
	 * @since 3.7
82
	 */
81
	 */
83
	public final ConsoleSession getService(Bundle bundle, ServiceRegistration<ConsoleSession> registration) {
82
	public final Object getService(Bundle bundle, ServiceRegistration<Object> registration) {
84
		if (sessionRegistration == null)
83
		if (sessionRegistration == null)
85
			sessionRegistration = registration;
84
			sessionRegistration = registration;
86
		return this;
85
		return this;
Lines 88-96 Link Here
88
87
89
	/**
88
	/**
90
	 * @noreference This method is not intended to be referenced by clients.
89
	 * @noreference This method is not intended to be referenced by clients.
91
	 * @since 3.7
92
	 */
90
	 */
93
	public final void ungetService(Bundle bundle, ServiceRegistration<ConsoleSession> registration, ConsoleSession service) {
91
	public final void ungetService(Bundle bundle, ServiceRegistration<Object> registration, Object service) {
94
		// do nothing
92
		// do nothing
95
	}
93
	}
96
94

Return to bug 324850